From 5f0b80b880b6b30359fcbeb9291f4846c0fbce22 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Tue, 15 May 2018 18:05:07 -0700 Subject: [PATCH 1/3] Revert "cbfs/payload type: Fix build warning and whitespace in name" This reverts commit 717ba748366cda19b7532897a5b8d59fc2cd25d9. This breaks seabios and a few other payloads. This is not ready for use. Change-Id: I48ebe2e2628c11e935357b900d01953882cd20dd Signed-off-by: Ronald G. Minnich Reviewed-on: https://review.coreboot.org/26310 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner Reviewed-by: Werner Zeh Reviewed-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/26331 --- payloads/Makefile.inc | 4 ++-- payloads/coreinfo/cbfs_module.c | 2 +- payloads/external/Makefile.inc | 6 +++--- src/arch/arm64/Makefile.inc | 2 +- util/cbfstool/cbfs.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc index ead2376dfa..d894dec4a7 100644 --- a/payloads/Makefile.inc +++ b/payloads/Makefile.inc @@ -15,12 +15,12 @@ cbfs-files-$(CONFIG_COREINFO_SECONDARY_PAYLOAD) += img/coreinfo img/coreinfo-file := payloads/coreinfo/build/coreinfo.elf -img/coreinfo-type := simple_elf +img/coreinfo-type := payload img/coreinfo-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG) cbfs-files-$(CONFIG_NVRAMCUI_SECONDARY_PAYLOAD) += img/nvramcui img/nvramcui-file := payloads/nvramcui/nvramcui.elf -img/nvramcui-type := simple_elf +img/nvramcui-type := payload img/nvramcui-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG) PAYLOADS_LIST=\ diff --git a/payloads/coreinfo/cbfs_module.c b/payloads/coreinfo/cbfs_module.c index b1690ba4ca..ee759352bf 100644 --- a/payloads/coreinfo/cbfs_module.c +++ b/payloads/coreinfo/cbfs_module.c @@ -188,7 +188,7 @@ static int cbfs_module_redraw(WINDOW * win) mvwprintw(win, row++, 38, "stage"); break; case COMPONENT_SELF: - mvwprintw(win, row++, 38, "simple_elf"); + mvwprintw(win, row++, 38, "simple ELF"); break; case COMPONENT_OPTIONROM: mvwprintw(win, row++, 38, "optionrom"); diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index d5e780c0b1..ec7d9a83ba 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -48,7 +48,7 @@ $(CONFIG_CBFS_PREFIX)/payload-file := $(CONFIG_PAYLOAD_FILE) ifeq ($(CONFIG_PAYLOAD_IS_FLAT_BINARY),y) $(CONFIG_CBFS_PREFIX)/payload-type := flat-binary else -$(CONFIG_CBFS_PREFIX)/payload-type := simple_elf +$(CONFIG_CBFS_PREFIX)/payload-type := payload endif $(CONFIG_CBFS_PREFIX)/payload-compression := $(CBFS_PAYLOAD_COMPRESS_FLAG) $(CONFIG_CBFS_PREFIX)/payload-options := $(ADDITIONAL_PAYLOAD_CONFIG) @@ -184,14 +184,14 @@ payloads/external/tint/tint/tint.elf tint: cbfs-files-$(CONFIG_TINT_SECONDARY_PAYLOAD) += img/tint img/tint-file := payloads/external/tint/tint/tint.elf -img/tint-type := simple_elf +img/tint-type := payload img/tint-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG) # Memtest86+ cbfs-files-$(CONFIG_MEMTEST_SECONDARY_PAYLOAD) += img/memtest img/memtest-file := payloads/external/Memtest86Plus/memtest86plus/memtest -img/memtest-type := simple_elf +img/memtest-type := payload img/memtest-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG) ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc index 2514aa949c..997c2da70f 100644 --- a/src/arch/arm64/Makefile.inc +++ b/src/arch/arm64/Makefile.inc @@ -194,7 +194,7 @@ $(BL31): $(obj)/build.h BL31_CBFS := $(CONFIG_CBFS_PREFIX)/bl31 $(BL31_CBFS)-file := $(BL31) -$(BL31_CBFS)-type := simple_elf +$(BL31_CBFS)-type := payload $(BL31_CBFS)-compression := $(CBFS_COMPRESS_FLAG) cbfs-files-y += $(BL31_CBFS) diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index b76e83eac1..1a4f101b57 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -204,7 +204,7 @@ static struct typedesc_t filetypes[] unused = { {CBFS_COMPONENT_BOOTBLOCK, "bootblock"}, {CBFS_COMPONENT_CBFSHEADER, "cbfs header"}, {CBFS_COMPONENT_STAGE, "stage"}, - {CBFS_COMPONENT_SELF, "simple_elf"}, + {CBFS_COMPONENT_SELF, "simple elf"}, {CBFS_COMPONENT_OPTIONROM, "optionrom"}, {CBFS_COMPONENT_BOOTSPLASH, "bootsplash"}, {CBFS_COMPONENT_RAW, "raw"}, From 6794ce02d45273427c1c6675950c8468380c040a Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Wed, 16 May 2018 13:12:35 +0200 Subject: [PATCH 2/3] Makefile.inc: Drop spurious `-t` from `cbfstool add-payload` The `-t` argument was never required for `add-payload` and results in a warning now because the type was renamed. TEST=Built with BUILD_TIMELESS=1 and compared binaries with and without this patch. Change-Id: I6ccb70acc6e88a602b90c625040d4f05d8e3630a Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/26332 Tested-by: build bot (Jenkins) --- Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index b11f6e231e..10b7d1ba1e 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -685,8 +685,8 @@ define cbfs-add-cmd-for-region $(filter flat-binary,$(call extract_nth,3,$(1))),-flat-binary) \ -f $(call extract_nth,1,$(1)) \ -n $(call extract_nth,2,$(1)) \ - $(if $(filter-out flat-binary,$(filter-out stage,$(call \ - extract_nth,3,$(1)))),-t $(call extract_nth,3,$(1))) \ + $(if $(filter-out flat-binary payload stage,$(call \ + extract_nth,3,$(1))),-t $(call extract_nth,3,$(1))) \ $(if $(call extract_nth,4,$(1)),-c $(call extract_nth,4,$(1))) \ $(cbfs-autogen-attributes) \ -r $(2) \ From f02ed614d2a031aeb73777b06dc0934bb9520e50 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 22 Oct 2021 07:46:14 +0200 Subject: [PATCH 3/3] util/sconfig: Avoid duplicate symbols in link step Recent linkers became more picky about unifying identical symbols, so avoid struct *device head to appear several times by marking it "extern". Follows a change in commit 79e8412665567c, but without carrying all the other refactorings done there. Change-Id: Icede0936cc99f1c183c09812bffc3cc9a3993efa Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/coreboot/+/58534 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- util/sconfig/sconfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/sconfig/sconfig.h b/util/sconfig/sconfig.h index 119d7b5fbf..3ca13b3e7c 100644 --- a/util/sconfig/sconfig.h +++ b/util/sconfig/sconfig.h @@ -77,7 +77,7 @@ struct device { struct reg *reg; }; -struct device *head; +extern struct device *head; struct header; struct header {