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

Jump to bottom

[platform/mellanox] Integrate sai version 1.14 and sdk 4.3.2104 #11

Closed
wants to merge 2 commits into from
Closed

[platform/mellanox] Integrate sai version 1.14 and sdk 4.3.2104 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94089ce
[platform/mellanox] Integrate sai version 76ced9d4a147163098054a717ec…
Sep 17, 2019
b6aa4ce
[platform/mellanox/fw.mk] add a url for fw.mk
Sep 17, 2019
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
9 changes: 7 additions & 2 deletions platform/mellanox/fw.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the url should be changed since it not upstreamed yet.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed.

$(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
Expand Down
7 changes: 6 additions & 1 deletion platform/mellanox/mlnx-sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
9 changes: 8 additions & 1 deletion platform/mellanox/mlnx-sai/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need specific commit.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is defined in the code below.


# build
pushd SAI-Implementation
Expand Down
10 changes: 8 additions & 2 deletions platform/mellanox/sdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down