Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/74196 )
Change subject: cpu/x86/64bit/Makefile: use verstage_x86 make target ......................................................................
cpu/x86/64bit/Makefile: use verstage_x86 make target
Use the 'verstage_x86' make target for the mode_switch.S compilation unit instead of making adding it to the 'verstage' target depending on VBOOT_STARTS_BEFORE_BOOTBLOCK not being selected. The only case where VBOOT_STARTS_BEFORE_BOOTBLOCK is selected is the verstage on PSP case, so I find using the 'verstage_x86' target here a bit easier to understand.
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: Iab618d4b9e325b07a648b91fcdce99c63644fbfc Reviewed-on: https://review.coreboot.org/c/coreboot/+/74196 Reviewed-by: Matt DeVillier matt.devillier@amd.corp-partner.google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/cpu/x86/64bit/Makefile.inc 1 file changed, 21 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Matt DeVillier: Looks good to me, approved
diff --git a/src/cpu/x86/64bit/Makefile.inc b/src/cpu/x86/64bit/Makefile.inc index 48f56fc..526291a 100644 --- a/src/cpu/x86/64bit/Makefile.inc +++ b/src/cpu/x86/64bit/Makefile.inc @@ -1,7 +1,5 @@ bootblock-y += mode_switch.S -ifneq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y) -verstage-y += mode_switch.S -endif +verstage_x86-y += mode_switch.S romstage-y += mode_switch.S postcar-y += mode_switch.S ramstage-y += mode_switch.S