From 3b3dd84fb1415f078ab160bb283d18807afff445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 15 Nov 2020 09:07:36 +0200 Subject: arch/arm: Replace .id section with build_info in CBFS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For arch/arm[64], the offsets to board identification strings and CONFIG_ROM_SIZE inside .id were never really used; it was only a convenience to have the strings appear near the start of image. Add the same strings in an uncompressed file in CBFS. Change-Id: I35d3312336e9c66d657d2ca619cf30fd79e18fd4 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/47602 Reviewed-by: Arthur Heymans Reviewed-by: Julius Werner Tested-by: build bot (Jenkins) --- Makefile.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Makefile.inc') diff --git a/Makefile.inc b/Makefile.inc index 90c249474bff..1212dae86fc3 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -530,6 +530,12 @@ $(build_h): $$(shell $$(build_h_check)) build-dirs $(objcbfs) $(objgenerated): mkdir -p $(objcbfs) $(objgenerated) +$(obj)/build_info: + @echo 'COREBOOT_VERSION: $(call strip_quotes,$(KERNELVERSION))' > $@.tmp + @echo 'MAINBOARD_VENDOR: $(call strip_quotes,$(CONFIG_MAINBOARD_VENDOR))' >> $@.tmp + @echo 'MAINBOARD_PART_NUMBER: $(call strip_quotes,$(CONFIG_MAINBOARD_PART_NUMBER))' >> $@.tmp + mv $@.tmp $@ + ####################################################################### # Build the tools CBFSTOOL:=$(objutil)/cbfstool/cbfstool @@ -1208,6 +1214,10 @@ cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += revision revision-file := $(obj)/build.h revision-type := raw +cbfs-files-y += build_info +build_info-file := $(obj)/build_info +build_info-type := raw + BOOTSPLASH_SUFFIX=$(suffix $(call strip_quotes,$(CONFIG_BOOTSPLASH_FILE))) cbfs-files-$(CONFIG_BOOTSPLASH_IMAGE) += bootsplash$(BOOTSPLASH_SUFFIX) bootsplash$(BOOTSPLASH_SUFFIX)-file := $(call strip_quotes,$(CONFIG_BOOTSPLASH_FILE)) -- cgit v1.2.3