Skip to content

Commit f8eb5b0

Browse files
santhosh-ktsanthosh-kt
authored
Flashrom refactoring for broadcom platforms (#7693)
#### Why I did it - To build flashrom properly with dependency tracking. #### How I did it - Moved flashrom code from platform/broadcom/sonic-platform-modules-dell/tools directory to src/flashrom directory. - At the end, flashrom_0.9.7_amd64.deb package is build which will be installed in the devices. - Currently flashrom builds only for Dell S6100 platforms.
1 parent 3ad830e commit f8eb5b0

15 files changed

+139
-15
lines changed

‎build_debian.sh

-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
325325
if [[ $CONFIGURED_ARCH == amd64 ]]; then
326326
## Pre-install the fundamental packages for amd64 (x86)
327327
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
328-
flashrom \
329328
rasdaemon
330329
fi
331330

‎files/build_templates/sonic_debian_extension.j2

+5
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,11 @@ sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/restart_service
350350
# Install custom-built openssh sshd
351351
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/openssh-server_*.deb
352352

353+
{% if sonic_asic_platform == 'broadcom' %}
354+
# Install custom-built flashrom
355+
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/flashrom_*.deb
356+
{% endif %}
357+
353358
# Copy crontabs
354359
sudo cp -f $IMAGE_CONFIGS/cron.d/* $FILESYSTEM_ROOT/etc/cron.d/
355360

‎platform/broadcom/one-aboot.mk

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ $(SONIC_ONE_ABOOT_IMAGE)_DEPENDENT_MACHINE = broadcom-dnx
66
$(SONIC_ONE_ABOOT_IMAGE)_IMAGE_TYPE = aboot
77
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_DRIVERS) $(ARISTA_PLATFORM_MODULE_PYTHON2) $(ARISTA_PLATFORM_MODULE_PYTHON3) $(ARISTA_PLATFORM_MODULE)
88
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(PHY_CREDO)
9+
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(FLASHROM)
910
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
1011
$(SONIC_ONE_ABOOT_IMAGE)_LAZY_BUILD_INSTALLS = $(BRCM_OPENNSL_KERNEL) $(BRCM_DNX_OPENNSL_KERNEL)
1112
ifeq ($(INSTALL_DEBUG_TOOLS),y)

‎platform/broadcom/one-image.mk

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ $(SONIC_ONE_IMAGE)_DEPENDENT_MACHINE = broadcom-dnx
66
$(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
77
$(SONIC_ONE_IMAGE)_INSTALLS += $(PDDF_PLATFORM_MODULE)
88
$(SONIC_ONE_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
9+
$(SONIC_ONE_IMAGE)_INSTALLS += $(FLASHROM)
910
$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(DELL_S6000_PLATFORM_MODULE) \
1011
$(DELL_Z9264F_PLATFORM_MODULE) \
1112
$(DELL_S5232F_PLATFORM_MODULE) \

‎platform/broadcom/platform-modules-dell.mk

-3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,3 @@ $(eval $(call add_extra_package,$(DELL_Z9100_PLATFORM_MODULE),$(DELL_S5248F_PLAT
5252
DELL_S5296F_PLATFORM_MODULE = platform-modules-s5296f_$(DELL_S5296F_PLATFORM_MODULE_VERSION)_amd64.deb
5353
$(DELL_S5296F_PLATFORM_MODULE)_PLATFORM = x86_64-dellemc_s5296f_c3538-r0
5454
$(eval $(call add_extra_package,$(DELL_Z9100_PLATFORM_MODULE),$(DELL_S5296F_PLATFORM_MODULE)))
55-
56-
#flashrom tool
57-
$(shell ./$(PLATFORM_PATH)/sonic-platform-modules-dell/tools/flashrom.sh > /dev/null 2>&1)

‎platform/broadcom/raw-image.mk

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ $(SONIC_RAW_IMAGE)_MACHINE = broadcom
55
$(SONIC_RAW_IMAGE)_IMAGE_TYPE = raw
66
$(SONIC_RAW_IMAGE)_INSTALLS += $(BRCM_OPENNSL_KERNEL)
77
$(SONIC_RAW_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
8+
$(SONIC_RAW_IMAGE)_INSTALLS += $(FLASHROM)
89
$(SONIC_RAW_IMAGE)_LAZY_INSTALLS += $($(SONIC_ONE_IMAGE)_LAZY_INSTALLS)
910
$(SONIC_RAW_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
1011
SONIC_INSTALLERS += $(SONIC_RAW_IMAGE)

‎platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install

-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ s6100/systemd/platform-modules-s6100.service etc/systemd/system
2525
s6100/systemd/s6100-lpc-monitor.service etc/systemd/system
2626
s6100/systemd/s6100-reboot-cause.service etc/systemd/system
2727
s6100/systemd/s6100-i2c-enumerate.service etc/systemd/system
28-
tools/flashrom/flashrom usr/local/bin/
2928
common/fw-updater usr/local/bin
3029
common/onie_mode_set usr/local/bin

‎platform/broadcom/sonic-platform-modules-dell/tools/flashrom.sh

-10
This file was deleted.

‎rules/flashrom.dep

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
SPATH := $($(FLASHROM)_SRC_PATH)
2+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/flashrom.mk rules/flashrom.dep
3+
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
4+
DEP_FILES += $(shell git ls-files $(SPATH))
5+
6+
$(FLASHROM)_CACHE_MODE := GIT_CONTENT_SHA
7+
$(FLASHROM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
8+
$(FLASHROM)_DEP_FILES := $(DEP_FILES)

‎rules/flashrom.mk

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# flashrom package
2+
#
3+
4+
FLASHROM_VERSION_FULL = 0.9.7
5+
6+
export FLASHROM_VERSION_FULL
7+
8+
FLASHROM = flashrom_$(FLASHROM_VERSION_FULL)_amd64.deb
9+
$(FLASHROM)_SRC_PATH = $(SRC_PATH)/flashrom
10+
11+
SONIC_MAKE_DEBS += $(FLASHROM)
12+
13+
export FLASHROM

‎src/flashrom/Makefile

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
SHELL = /bin/bash
2+
.ONESHELL:
3+
.SHELLFLAGS += -e
4+
5+
6+
MAIN_TARGET = $(FLASHROM)
7+
8+
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
9+
rm -rf ./flashrom-$(FLASHROM_VERSION_FULL)
10+
# Obtain flashrom
11+
git clone https://github.com/flashrom/flashrom.git flashrom-$(FLASHROM_VERSION_FULL)
12+
pushd ./flashrom-$(FLASHROM_VERSION_FULL)
13+
14+
# Check out tag: tags/0.9.7
15+
git checkout -b flashrom-src tags/$(FLASHROM_VERSION_FULL)
16+
17+
# Apply patch series
18+
stg init
19+
stg import -s ../patch/series
20+
21+
# Build package
22+
dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
23+
popd
24+
25+
mv $* $(DEST)/

‎platform/broadcom/sonic-platform-modules-dell/tools/0002-Flashrom-support-for-Intel-Rangeley-and-Denverton-CP.patch renamed to ‎src/flashrom/patch/0002-Flashrom-support-for-Intel-Rangeley-and-Denverton-CP.patch

File renamed without changes.

‎src/flashrom/patch/0003-Debian-package-base.patch

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
diff --git a/debian/changelog b/debian/changelog
2+
new file mode 100644
3+
index 0000000..a7acb04
4+
--- /dev/null
5+
+++ b/debian/changelog
6+
@@ -0,0 +1,5 @@
7+
+flashrom (0.9.7) unstable; urgency=low
8+
+
9+
+ * Initial release
10+
+
11+
+ -- Dell Team <[email protected]> Mon, 14 Dec 2020 10:10:10 -0800
12+
diff --git a/debian/compat b/debian/compat
13+
new file mode 100644
14+
index 0000000..ec63514
15+
--- /dev/null
16+
+++ b/debian/compat
17+
@@ -0,0 +1 @@
18+
+9
19+
diff --git a/debian/control b/debian/control
20+
new file mode 100644
21+
index 0000000..8aafc90
22+
--- /dev/null
23+
+++ b/debian/control
24+
@@ -0,0 +1,8 @@
25+
+Source: flashrom
26+
+Section: main
27+
+Priority: optional
28+
+Maintainer: Dell Team <[email protected]>
29+
+
30+
+Package: flashrom
31+
+Architecture: amd64
32+
+Description: Flashrom Utility
33+
diff --git a/debian/rules b/debian/rules
34+
new file mode 100755
35+
index 0000000..492b21d
36+
--- /dev/null
37+
+++ b/debian/rules
38+
@@ -0,0 +1,7 @@
39+
+#!/usr/bin/make -f
40+
+
41+
+
42+
+%:
43+
+ dh $@
44+
+
45+
+override_dh_usrlocal:

‎src/flashrom/patch/0004-Flashrom-remove-tmpl.patch

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git a/Makefile b/Makefile
2+
index 0e976e5..d4413df 100644
3+
--- a/Makefile
4+
+++ b/Makefile
5+
@@ -686,7 +686,7 @@ FEATURE_LIBS += $(shell LC_ALL=C grep -q "NEEDLIBZ := yes" .libdeps && printf "%
6+
LIBFLASHROM_OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS)
7+
OBJS = $(CLI_OBJS) $(LIBFLASHROM_OBJS)
8+
9+
-all: hwlibs features $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8
10+
+all: hwlibs features $(PROGRAM)$(EXEC_SUFFIX)
11+
ifeq ($(ARCH), x86)
12+
@+$(MAKE) -C util/ich_descriptors_tool/ TARGET_OS=$(TARGET_OS) EXEC_SUFFIX=$(EXEC_SUFFIX)
13+
endif
14+
@@ -914,22 +914,9 @@ endif
15+
@$(DIFF) -q .features.tmp .features >/dev/null 2>&1 && rm .features.tmp || mv .features.tmp .features
16+
@rm -f .featuretest.c .featuretest$(EXEC_SUFFIX)
17+
18+
-$(PROGRAM).8: $(PROGRAM).8.tmpl
19+
- @sed -e '1 s#".*".*#"$(shell ./util/getrevision.sh -d $(PROGRAM).8.tmpl)" "$(VERSION)"#' <$< >$@
20+
-
21+
-install: $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8
22+
+install: $(PROGRAM)$(EXEC_SUFFIX)
23+
mkdir -p $(DESTDIR)$(PREFIX)/sbin
24+
- mkdir -p $(DESTDIR)$(MANDIR)/man8
25+
$(INSTALL) -m 0755 $(PROGRAM)$(EXEC_SUFFIX) $(DESTDIR)$(PREFIX)/sbin
26+
- $(INSTALL) -m 0644 $(PROGRAM).8 $(DESTDIR)$(MANDIR)/man8
27+
-
28+
-export: $(PROGRAM).8
29+
- @rm -rf $(EXPORTDIR)/flashrom-$(RELEASENAME)
30+
- @svn export -r BASE . $(EXPORTDIR)/flashrom-$(RELEASENAME)
31+
- @sed "s/^SVNVERSION.*/SVNVERSION := $(SVNVERSION)/" Makefile >$(EXPORTDIR)/flashrom-$(RELEASENAME)/Makefile
32+
- @cp $(PROGRAM).8 "$(EXPORTDIR)/flashrom-$(RELEASENAME)/$(PROGRAM).8"
33+
- @LC_ALL=C svn log >$(EXPORTDIR)/flashrom-$(RELEASENAME)/ChangeLog
34+
- @echo Exported $(EXPORTDIR)/flashrom-$(RELEASENAME)/
35+
36+
tarball: export
37+
@tar cjf $(EXPORTDIR)/flashrom-$(RELEASENAME).tar.bz2 -C $(EXPORTDIR)/ $(TAROPTIONS) flashrom-$(RELEASENAME)/

‎src/flashrom/patch/series

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
0002-Flashrom-support-for-Intel-Rangeley-and-Denverton-CP.patch
2+
0003-Debian-package-base.patch
3+
0004-Flashrom-remove-tmpl.patch

0 commit comments

Comments
 (0)