From a033d8c808faca13a80e59f5a6e2c2599b3dbbb8 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Wed, 5 May 2021 14:20:03 +0200 Subject: [PATCH] arch/x86: Always include walkcbfs.S Let the linker decide if this code is needed. Change-Id: I26fb19d461db39ce554af7b948f0d10a12920299 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/52940 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph --- src/arch/x86/Makefile.inc | 2 +- src/cpu/qemu-x86/Makefile.inc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index a3c61c40bc..07378920d8 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -91,7 +91,7 @@ else $(eval $(call early_x86_stage,bootblock,elf64-x86-64)) endif -bootblock-$(CONFIG_MICROCODE_UPDATE_PRE_RAM) += walkcbfs.S +bootblock-y += walkcbfs.S endif # CONFIG_ARCH_BOOTBLOCK_X86_32 / CONFIG_ARCH_BOOTBLOCK_X86_64 diff --git a/src/cpu/qemu-x86/Makefile.inc b/src/cpu/qemu-x86/Makefile.inc index 3f27e8b247..fb560d6b7c 100644 --- a/src/cpu/qemu-x86/Makefile.inc +++ b/src/cpu/qemu-x86/Makefile.inc @@ -2,7 +2,6 @@ bootblock-y += cache_as_ram_bootblock.S bootblock-y += bootblock.c -bootblock-$(CONFIG_ARCH_BOOTBLOCK_X86_64) += $(top)/src/arch/x86/walkcbfs.S romstage-y += ../intel/car/romstage.c