From 34f5cd9cb233dea539a94ff2cc8c06effced988d Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 21 Apr 2022 12:00:21 +0200 Subject: cpu/x86/64bit: Add a separate Makefile.inc Follow-up patches will add more to this makefile. Change-Id: I8da6265b4c810e39a67f5ec27e26eeb26e3679a4 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/63758 Tested-by: build bot (Jenkins) Reviewed-by: Raul Rangel Reviewed-by: Lean Sheng Tan --- src/cpu/x86/64bit/Makefile.inc | 7 +++++++ src/cpu/x86/Makefile.inc | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 src/cpu/x86/64bit/Makefile.inc (limited to 'src') diff --git a/src/cpu/x86/64bit/Makefile.inc b/src/cpu/x86/64bit/Makefile.inc new file mode 100644 index 0000000000..721e62044d --- /dev/null +++ b/src/cpu/x86/64bit/Makefile.inc @@ -0,0 +1,7 @@ +bootblock-y += mode_switch.S +ifneq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y) +verstage-y += mode_switch.S +endif +romstage-y += mode_switch.S +postcar-y += mode_switch.S +ramstage-y += mode_switch.S diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc index b9705286f8..dffc2b1cb9 100644 --- a/src/cpu/x86/Makefile.inc +++ b/src/cpu/x86/Makefile.inc @@ -3,8 +3,8 @@ subdirs-y += mtrr subdirs-y += pae subdirs-$(CONFIG_HAVE_SMI_HANDLER) += smm subdirs-$(CONFIG_UDELAY_TSC) += tsc - -all-$(CONFIG_ARCH_ALL_STAGES_X86_64) += 64bit/mode_switch.S +# Use ARCH_BOOTBLOCK_X86_64 as a proxy for knowing if 64bit is going to be used +subdirs-$(CONFIG_ARCH_BOOTBLOCK_X86_64) += 64bit subdirs-$(CONFIG_PARALLEL_MP) += name ramstage-$(CONFIG_PARALLEL_MP) += mp_init.c -- cgit v1.2.3