Revert "Flashrom refactoring (sonic-net#6922)"

This reverts commit 7dd9d1f.
raphaelt-nvidia · May 13, 2021 · c5ff825 · c5ff825
1 parent 5b6cecc
commit c5ff825
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 133 deletions.
diff --git a/build_debian.sh b/build_debian.sh
@@ -326,6 +326,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
 ## Pre-install the fundamental packages for amd64 (x86)
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install      \
+    flashrom                \
     rasdaemon
 fi
 

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
@@ -339,9 +339,6 @@ sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/container_checker
 # Install custom-built openssh sshd
 sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/openssh-server_*.deb
 
-# Install custom-built flashrom
-sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/flashrom_*.deb
-
 # Copy crontabs
 sudo cp -f $IMAGE_CONFIGS/cron.d/* $FILESYSTEM_ROOT/etc/cron.d/
 

diff --git a/platform/broadcom/platform-modules-dell.mk b/platform/broadcom/platform-modules-dell.mk
@@ -52,3 +52,6 @@ $(eval $(call add_extra_package,$(DELL_Z9100_PLATFORM_MODULE),$(DELL_S5248F_PLAT
 DELL_S5296F_PLATFORM_MODULE = platform-modules-s5296f_$(DELL_S5296F_PLATFORM_MODULE_VERSION)_amd64.deb
 $(DELL_S5296F_PLATFORM_MODULE)_PLATFORM = x86_64-dellemc_s5296f_c3538-r0
 $(eval $(call add_extra_package,$(DELL_Z9100_PLATFORM_MODULE),$(DELL_S5296F_PLATFORM_MODULE)))
+
+#flashrom tool
+$(shell ./$(PLATFORM_PATH)/sonic-platform-modules-dell/tools/flashrom.sh  > /dev/null 2>&1)
diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
@@ -25,5 +25,6 @@ s6100/systemd/platform-modules-s6100.service etc/systemd/system
 s6100/systemd/s6100-lpc-monitor.service etc/systemd/system
 s6100/systemd/s6100-reboot-cause.service etc/systemd/system
 s6100/systemd/s6100-i2c-enumerate.service etc/systemd/system
+tools/flashrom/flashrom usr/local/bin/
 common/fw-updater usr/local/bin
 common/onie_mode_set usr/local/bin
diff --git a/...for-Intel-Rangeley-and-Denverton-CP.patch → ...for-Intel-Rangeley-and-Denverton-CP.patch b/...for-Intel-Rangeley-and-Denverton-CP.patch → ...for-Intel-Rangeley-and-Denverton-CP.patch
diff --git a/platform/broadcom/sonic-platform-modules-dell/tools/flashrom.sh b/platform/broadcom/sonic-platform-modules-dell/tools/flashrom.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+export DELL_TOOLS_DIR="platform/broadcom/sonic-platform-modules-dell/tools"
+
+cd $DELL_TOOLS_DIR
+rm -rf $DELL_TOOLS_DIR/flashrom
+git clone https://github.com/flashrom/flashrom.git
+cd flashrom
+git checkout tags/0.9.7
+git apply ../0002-Flashrom-support-for-Intel-Rangeley-and-Denverton-CP.patch
+make
diff --git a/rules/flashrom.dep b/rules/flashrom.dep
diff --git a/rules/flashrom.mk b/rules/flashrom.mk
diff --git a/slave.mk b/slave.mk
@@ -864,7 +864,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
                 $(LIBNSS_TACPLUS) \
                 $(MONIT) \
                 $(OPENSSH_SERVER) \
-                $(FLASHROM) \
                 $(PYTHON_SWSSCOMMON) \
                 $(PYTHON3_SWSSCOMMON) \
                 $(SONIC_UTILITIES_DATA) \

diff --git a/src/flashrom/Makefile b/src/flashrom/Makefile
diff --git a/src/flashrom/patch/0003-Debian-package-base.patch b/src/flashrom/patch/0003-Debian-package-base.patch
diff --git a/src/flashrom/patch/0004-Flashrom-remove-tmpl.patch b/src/flashrom/patch/0004-Flashrom-remove-tmpl.patch
diff --git a/src/flashrom/patch/series b/src/flashrom/patch/series