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

Update Mellanox firmware, SDK, SAI 1.0.2 #737

Merged
merged 1 commit into from
Jun 22, 2017
Merged

Update Mellanox firmware, SDK, SAI 1.0.2 #737

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/docker-syncd-mlnx/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ debs/{{ deb }}{{' '}}

COPY ["start.sh", "mlnx-fw-upgrade.sh", "/usr/bin/"]
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
COPY ["/debs/fw-SPC-rel-13_1300_0130-EVB.mfa", "/etc/mlnx/"]
COPY ["/debs/fw-SPC-rel-13_1400_0122-EVB.mfa", "/etc/mlnx/"]

## Clean up
RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
Expand Down
4 changes: 2 additions & 2 deletions platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash

query_retry_count_max="10"
required_fw_version="13.1300.0130"
fw_file=/etc/mlnx/fw-SPC-rel-13_1300_0130-EVB.mfa
required_fw_version="13.1400.0122"
fw_file=/etc/mlnx/fw-SPC-rel-13_1400_0122-EVB.mfa

run_or_fail() {
$1
Expand Down
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,5 +1,5 @@
# mellanox firmware

MLNX_FW = fw-SPC-rel-13_1300_0130-EVB.mfa
MLNX_FW = fw-SPC-rel-13_1400_0122-EVB.mfa
$(MLNX_FW)_URL = $(MLNX_SDK_BASE_URL)/$(MLNX_FW)
SONIC_ONLINE_FILES += $(MLNX_FW)
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.8.1-master
MLNX_SAI_REVISION = b3e60a3e3eee45a783579616e98e378815ee5591
MLNX_SAI_VERSION = SAIRel1.8.2-master
MLNX_SAI_REVISION = e7a8a8c6dbf6a03acb1f7090eb2555ccc6a3947b

export MLNX_SAI_VERSION MLNX_SAI_REVISION

Expand Down
4 changes: 2 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,5 @@
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/f3a5883f93d7ef6ad8aa002e4e5abaa22fb7adfd/sdk
MLNX_SDK_VERSION = 4.2.4000
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/sonicv1.0.2/sdk
MLNX_SDK_VERSION = 4.2.5008
MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2) $(SX_ACL_RM) $(SX_COMPLIB) \
$(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \
$(SXD_LIBS) $(TESTX)
Expand Down