[Mellanox] Update FW/SDK: 13/29.2000.2696 and 4.3.2904 (#3948)

This commit is contained in:
noaOrMlnx 2019-12-31 17:01:08 +02:00 committed by liat-grozovik
parent 24a0c46464
commit ea1128741c
5 changed files with 4 additions and 23 deletions

View File

@ -11,12 +11,12 @@ else
FW_FROM_URL = n
endif
MLNX_SPC_FW_VERSION = 13.2000.2602
MLNX_SPC_FW_VERSION = 13.2000.2696
MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
$(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
MLNX_SPC2_FW_VERSION = 29.2000.2602
MLNX_SPC2_FW_VERSION = 29.2000.2696
MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
$(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)

View File

@ -19,7 +19,6 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
fi
# build
patch -p1 < ../sx_kernel_makefile_sonic_build.patch
debuild -e KVERSION=$(KVERSION) -e KSRC_EXT=/lib/modules/$(KVERSION)/source/ -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)

@ -1 +1 @@
Subproject commit 87f7a7911275285abc63c24ba39aa4af4c4b4678
Subproject commit c08b5bb3810fe7da2811622aa7003ac9cc95344b

View File

@ -1,18 +0,0 @@
diff --git a/makefile b/makefile
index f23f0ac..a16b2ce 100644
--- a/makefile
+++ b/makefile
@@ -93,10 +93,10 @@ V ?= 1
ifneq ($(findstring 3.10,$(KVERSION))$(findstring 3.13,$(KVERSION))$(findstring 3.14,$(KVERSION))$(findstring 3.16,$(KVERSION)),)
MLNX_LINUX_AUTOCONF_FILE = include/generated/autoconf.h
-MLNX_LINUX_EXTRA_INCLUDE_FILES = -include include/linux/kconfig.h
+MLNX_LINUX_EXTRA_INCLUDE_FILES = -include $(KSRC_EXT)/include/linux/kconfig.h
MLNX_LINUX_EXTRA_INCLUDE_FOLDERS = \
- -Iarch/$$(SRCARCH)/include/uapi \
- -Iinclude/uapi \
+ -I$(KSRC_EXT)/arch/$$(SRCARCH)/include/uapi \
+ -I$(KSRC_EXT)/include/uapi \
-Iarch/$$(SRCARCH)/include/generated/uapi \
-Iarch/$$(SRCARCH)/include/generated \
-Iinclude/generated/uapi

View File

@ -1,5 +1,5 @@
MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
MLNX_SDK_VERSION = 4.3.2602
MLNX_SDK_VERSION = 4.3.2904
MLNX_SDK_ISSU_VERSION = 101
MLNX_SDK_DEB_VERSION = $(subst _,.,$(MLNX_SDK_VERSION))