Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63758 )
Change subject: cpu/x86/64bit: Add a separate Makefile.inc ......................................................................
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 arthur@aheymans.xyz --- A src/cpu/x86/64bit/Makefile.inc M src/cpu/x86/Makefile.inc 2 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/63758/1
diff --git a/src/cpu/x86/64bit/Makefile.inc b/src/cpu/x86/64bit/Makefile.inc new file mode 100644 index 0000000..721e620 --- /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 b970528..dffc2b1 100644 --- a/src/cpu/x86/Makefile.inc +++ b/src/cpu/x86/Makefile.inc @@ -3,8 +3,8 @@ 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