Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31467 )
Change subject: walkcbfs: Only compile on x86_32 ......................................................................
walkcbfs: Only compile on x86_32
The current implementation was designed for x86_32, so don't attempt to compile it on x86_64 until it is fixed.
Fixes compilation error on x86_64.
Change-Id: Ibd87dc2979f6d45a988119c06c5f9e61b3e86171 Signed-off-by: Patrick Rudolph siro@das-labor.org Reviewed-on: https://review.coreboot.org/c/31467 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Georgi pgeorgi@google.com Reviewed-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/arch/x86/Makefile.inc 1 file changed, 2 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved Kyösti Mälkki: Looks good to me, approved
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 8dafac8..3c4a8b0 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -122,7 +122,7 @@ $(eval $(call early_x86_stage,bootblock,elf64-x86-64)) endif
-bootblock-y += walkcbfs.S +bootblock-$(CONFIG_ARCH_BOOTBLOCK_X86_32) += walkcbfs.S
else # !C_ENVIRONMENT_BOOTBLOCK
@@ -235,7 +235,7 @@ romstage-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c romstage-y += postcar_loader.c romstage-$(CONFIG_COLLECT_TIMESTAMPS_TSC) += timestamp.c -romstage-y += walkcbfs.S +romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += walkcbfs.S
romstage-srcs += $(wildcard $(src)/mainboard/$(MAINBOARDDIR)/romstage.c) romstage-libs ?=