[201911] [Mellanox] Add BIOS upgrade infra

files/build_templates/sonic_debian_extension.j2

@@ -521,6 +521,18 @@ sudo cp {{src}} $FILESYSTEM_ROOT/{{dst}}
 {% endfor -%}
 
 {% if sonic_asic_platform == "mellanox" %}
+if [ -n "$MLNX_CPLD_ARCHIVES" ]; then
+sudo mkdir -p $FILESYSTEM_ROOT/etc/mlnx/cpld/
+for MLNX_CPLD_ARCHIVE in $MLNX_CPLD_ARCHIVES; do
+    sudo cp $files_path/$MLNX_CPLD_ARCHIVE $FILESYSTEM_ROOT/etc/mlnx/cpld/
+done
+fi
+if [ -n "$MLNX_BIOS_ARCHIVES" ]; then
+sudo mkdir -p $FILESYSTEM_ROOT/etc/mlnx/bios/
+for MLNX_BIOS_ARCHIVE in $MLNX_BIOS_ARCHIVES; do
+    sudo cp $files_path/$MLNX_BIOS_ARCHIVE $FILESYSTEM_ROOT/etc/mlnx/bios/
+done
+fi
 sudo mkdir -p $FILESYSTEM_ROOT/etc/mlnx/
 sudo cp $files_path/$MLNX_SPC_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC.mfa
 sudo cp $files_path/$MLNX_SPC2_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC2.mfa
@@ -529,10 +541,6 @@ sudo cp $files_path/$ISSU_VERSION_FILE $FILESYSTEM_ROOT/etc/mlnx/issu-version
 sudo cp $files_path/$MLNX_FFB_SCRIPT $FILESYSTEM_ROOT/usr/bin/mlnx-ffb.sh
 sudo cp $files_path/$MLNX_ONIE_FW_UPDATE $FILESYSTEM_ROOT/usr/bin/$MLNX_ONIE_FW_UPDATE
 sudo cp $files_path/$MLNX_SSD_FW_UPDATE $FILESYSTEM_ROOT/usr/bin/$MLNX_SSD_FW_UPDATE
-sudo mkdir -p $FILESYSTEM_ROOT/etc/mlnx/cpld/
-for MLNX_CPLD_ARCHIVE in $MLNX_CPLD_ARCHIVES; do
-    sudo cp $files_path/$MLNX_CPLD_ARCHIVE $FILESYSTEM_ROOT/etc/mlnx/cpld/
-done
 j2 platform/mellanox/mlnx-fw-upgrade.j2 | sudo tee $FILESYSTEM_ROOT/usr/bin/mlnx-fw-upgrade.sh
 sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/mlnx-fw-upgrade.sh
 

platform/mellanox/.gitignore

@@ -16,6 +16,10 @@ sdk-src/*/*
 */*.gz
 */*.egg-info
 
+# Exceptions
+!cpld/*.gz
+!bios/*.gz
+
 # Autogenerated Dockerfiles
 docker-syncd-mlnx/Dockerfile
 docker-syncd-mlnx-rpc/Dockerfile

platform/mellanox/bios.mk

@@ -0,0 +1,15 @@
+# Mellanox BIOS firmware
+
+ifeq ($(shell [ -f $(PLATFORM_PATH)/bios/msn3800_bios.tar.gz ] && echo yes),yes)
+MLNX_SN3800_BIOS_ARCHIVE = msn3800_bios.tar.gz
+$(MLNX_SN3800_BIOS_ARCHIVE)_PATH = $(PLATFORM_PATH)/bios/
+SONIC_COPY_FILES += $(MLNX_SN3800_BIOS_ARCHIVE)
+
+MLNX_BIOS_ARCHIVES += $(MLNX_SN3800_BIOS_ARCHIVE)
+endif
+
+ifdef MLNX_BIOS_ARCHIVES
+MLNX_FILES += $(MLNX_BIOS_ARCHIVES)
+
+export MLNX_BIOS_ARCHIVES
+endif

platform/mellanox/bios/README.md

@@ -0,0 +1,5 @@
+# Mellanox BIOS
+
+## Description
+
+This directory contains BIOS packages.

platform/mellanox/cpld.mk

@@ -1,9 +1,11 @@
-# mellanox cpld firmware
+# Mellanox CPLD firmware
 
 MLNX_SN2700_CPLD_ARCHIVE = msn2700_cpld.tar.gz
-$(MLNX_SN2700_CPLD_ARCHIVE)_PATH = platform/mellanox/cpld/
+$(MLNX_SN2700_CPLD_ARCHIVE)_PATH = $(PLATFORM_PATH)/cpld/
 SONIC_COPY_FILES += $(MLNX_SN2700_CPLD_ARCHIVE)
 
 MLNX_CPLD_ARCHIVES += $(MLNX_SN2700_CPLD_ARCHIVE)
 
+MLNX_FILES += $(MLNX_CPLD_ARCHIVES)
+
 export MLNX_CPLD_ARCHIVES

platform/mellanox/cpld/README.md

@@ -0,0 +1,5 @@
+# Mellanox CPLD
+
+## Description
+
+This directory contains CPLD packages.

platform/mellanox/one-image.mk

@@ -11,5 +11,5 @@ $(SONIC_ONE_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.g
 else
 $(SONIC_ONE_IMAGE)_DOCKERS = $(SONIC_INSTALL_DOCKER_IMAGES)
 endif
-$(SONIC_ONE_IMAGE)_FILES += $(MLNX_FILES)  $(MLNX_CPLD_ARCHIVES) 
+$(SONIC_ONE_IMAGE)_FILES += $(MLNX_FILES)
 SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)

platform/mellanox/rules.mk

@@ -1,5 +1,6 @@
 include $(PLATFORM_PATH)/sdk.mk
 include $(PLATFORM_PATH)/cpld.mk
+include $(PLATFORM_PATH)/bios.mk
 include $(PLATFORM_PATH)/fw.mk
 include $(PLATFORM_PATH)/mft.mk
 include $(PLATFORM_PATH)/mlnx-sai.mk