From 0eb9c57049c091b767f5fe65a8c6886567b0700e Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Sat, 5 Jan 2019 18:21:47 +0100 Subject: arch/x86: Link walkcbfs.S instead of including it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Link walkfcbfs.S in the C_ENVIRONMENT_BOOTBLOCK case and also in the romstage. This is useful for cbfs access in pre-CAR environments. Change-Id: I9a17cdf01c7cbc3c9ac45ed1f075731f3e32f64b Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/30681 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki --- src/arch/x86/Makefile.inc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/arch/x86/Makefile.inc') diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index d6f9b6b0a0..8dafac8131 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -122,6 +122,8 @@ else $(eval $(call early_x86_stage,bootblock,elf64-x86-64)) endif +bootblock-y += walkcbfs.S + else # !C_ENVIRONMENT_BOOTBLOCK # x86-specific linker flags @@ -233,6 +235,7 @@ romstage-y += memset.c 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-srcs += $(wildcard $(src)/mainboard/$(MAINBOARDDIR)/romstage.c) romstage-libs ?= -- cgit v1.2.3