diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk index b8f83644622..d1cde4f2bca 100644 --- a/platform/mellanox/fw.mk +++ b/platform/mellanox/fw.mk @@ -1,8 +1,13 @@ # mellanox firmware -MLNX_FW_VERSION = 13.2000.1420 +# Stephen Sun comments out for sdk/sai integration +# MLNX_FW_VERSION = 13.2000.1420 +# +MLNX_FW_VERSION = 13.2000.2104 +MLNX_FW_BASE_URL = http://arc-build-server/fw/ + MLNX_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_FW_VERSION))-EVB.mfa -$(MLNX_FW_FILE)_URL = $(MLNX_SDK_BASE_URL)/$(MLNX_FW_FILE) +$(MLNX_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_FW_FILE) SONIC_ONLINE_FILES += $(MLNX_FW_FILE) export MLNX_FW_VERSION diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk index fd9f5b473de..5d3a0913995 100644 --- a/platform/mellanox/mlnx-sai.mk +++ b/platform/mellanox/mlnx-sai.mk @@ -1,7 +1,12 @@ # Mellanox SAI MLNX_SAI_VERSION = SAIRel1.14.1-master -MLNX_SAI_REVISION = 80e08e8f12746801d683730a5e147cd6e77becfb +# +# MLNX_SAI_REVISION = 80e08e8f12746801d683730a5e147cd6e77becfb +# Stephen Sun comments this out for new SAI integration +# We use the following commit +# +MLNX_SAI_REVISION = 76ced9d4a147163098054a717ecce56d58478b35 export MLNX_SAI_VERSION MLNX_SAI_REVISION diff --git a/platform/mellanox/mlnx-sai/Makefile b/platform/mellanox/mlnx-sai/Makefile index 9a8005e5461..7a3e3787bb2 100644 --- a/platform/mellanox/mlnx-sai/Makefile +++ b/platform/mellanox/mlnx-sai/Makefile @@ -7,7 +7,14 @@ MAIN_TARGET = mlnx-sai_1.mlnx.$(MLNX_SAI_VERSION)_amd64.deb $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # get sources rm -rf SAI-Implementation - git clone https://github.com/Mellanox/SAI-Implementation.git +# +# Stephen Sun comment this out for new SAI integration +# +# git clone https://github.com/Mellanox/SAI-Implementation.git +# +# It should be cloned from our internal git as following +# + git clone file:////auto/mswg/git/switchx/sai_interface.git SAI-Implementation # build pushd SAI-Implementation diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk index 7a767bdd5e3..31a250e733a 100644 --- a/platform/mellanox/sdk.mk +++ b/platform/mellanox/sdk.mk @@ -1,5 +1,11 @@ -MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/8c9e1ab89529967a2b1c567952c355290508308d/sdk -MLNX_SDK_VERSION = 4.3.1420 +# +# Stephen Sun comments this out for SDK integration +# +# MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/8c9e1ab89529967a2b1c567952c355290508308d/sdk +# MLNX_SDK_VERSION = 4.3.1420 +# +MLNX_SDK_BASE_URL = http://arc-build-server/sdk/sx_sdk_eth-4.3.2104/SOURCES/ +MLNX_SDK_VERSION = 4.3.2104 MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_ACL_RM) $(SX_COMPLIB) \ $(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \ $(SXD_LIBS) $(TESTX) $(WJH_LIBS)