Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Mellanox] Update SAI to v1.4, SDK to v4.3.1420 #46

Merged
merged 1 commit into from
Jul 2, 2019
Merged

[Mellanox] Update SAI to v1.4, SDK to v4.3.1420 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/mellanox/fw.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# mellanox firmware

MLNX_FW_VERSION = 13.1910.0928
MLNX_FW_VERSION = 13.2000.1420
MLNX_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_FW_VERSION))-EVB.mfa
$(MLNX_FW_FILE)_URL = $(MLNX_SDK_BASE_URL)/$(MLNX_FW_FILE)
SONIC_ONLINE_FILES += $(MLNX_FW_FILE)
Expand Down
4 changes: 2 additions & 2 deletions platform/mellanox/mlnx-sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Mellanox SAI

MLNX_SAI_VERSION = SAIRel1.13.4-master
MLNX_SAI_REVISION = 6ea244309b944af3bb34a9b99ad6ed60c5dc9937
MLNX_SAI_VERSION = SAIRel1.14.1-master
MLNX_SAI_REVISION = 80e08e8f12746801d683730a5e147cd6e77becfb

export MLNX_SAI_VERSION MLNX_SAI_REVISION

Expand Down
15 changes: 11 additions & 4 deletions platform/mellanox/sdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/378cc53bef634b6ae192819d7f412fb1543faff6/sdk
MLNX_SDK_VERSION = 4.3.0136
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/8c9e1ab89529967a2b1c567952c355290508308d/sdk
MLNX_SDK_VERSION = 4.3.1420
MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_ACL_RM) $(SX_COMPLIB) \
$(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \
$(SXD_LIBS) $(TESTX)
$(SXD_LIBS) $(TESTX) $(WJH_LIBS)

MLNX_SDK_DEBS += $(APPLIBS_DEV) $(IPROUTE2_MLNX_DEV) $(SX_ACL_RM_DEV) \
$(SX_COMPLIB_DEV) $(SX_COMPLIB_DEV_STATIC) $(SX_EXAMPLES_DEV) \
$(SX_GEN_UTILS_DEV) $(SX_SCEW_DEV) $(SX_SCEW_DEV_STATIC) \
$(SX_SDN_HAL_DEV) $(SX_SDN_HAL_DEV_STATIC) $(SXD_LIBS_DEV) \
$(SXD_LIBS_DEV_STATIC) $(TESTX_DEV)
$(SXD_LIBS_DEV_STATIC) $(TESTX_DEV) $(WJH_LIBS_DEV)

APPLIBS = applibs_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
$(APPLIBS)_DEPENDS += $(SX_COMPLIB) $(SX_GEN_UTILS) $(SXD_LIBS) $(LIBNL3) $(LIBNL_GENL3)
Expand Down Expand Up @@ -45,6 +45,13 @@ SX_KERNEL = sx-kernel_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
SX_KERNEL_DEV = sx-kernel-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
$(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV)))

WJH_LIBS = wjh-libs_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
#$(WJH_LIBS)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/wjh-libs
$(WJH_LIBS)_DEPENDS += $(SX_COMPLIB_DEV) $(SXD_LIBS_DEV) $(APPLIBS_DEV)
$(WJH_LIBS)_RDEPENDS += $(SX_COMPLIB) $(PYTHON_SDK_API)
WJH_LIBS_DEV = wjh-libs-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
$(eval $(call add_derived_package,$(WJH_LIBS),$(WJH_LIBS_DEV)))

define make_url
$(1)_URL = $(MLNX_SDK_BASE_URL)/$(1)

Expand Down