From 7f1097e84b315a521ad06c71143883157c40062a Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed, 21 Jun 2017 02:07:22 +0000
Subject: [PATCH] Update Mellanox firmware, SDK, SAI 1.0.2

---
 platform/mellanox/docker-syncd-mlnx/Dockerfile.j2      | 2 +-
 platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh | 4 ++--
 platform/mellanox/fw.mk                                | 2 +-
 platform/mellanox/mlnx-sai.mk                          | 4 ++--
 platform/mellanox/sdk.mk                               | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
index 4f8dd621e93d..1b2d0e11244f 100755
--- a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
+++ b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
@@ -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
diff --git a/platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh b/platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh
index 62a9c8625234..70e2d2d659e9 100755
--- a/platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh
+++ b/platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh
@@ -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
diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 964c4c30bc04..6e98fd8edf1e 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -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)
diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk
index 3dbf1e8f293e..5e8dbd1a90f6 100644
--- a/platform/mellanox/mlnx-sai.mk
+++ b/platform/mellanox/mlnx-sai.mk
@@ -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
 
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 08deb4517597..56e3145945f8 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -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)