From 549528d4a22a875985e41c34ac7b9c73f463478d Mon Sep 17 00:00:00 2001 From: Felix Held Date: Mon, 3 Apr 2023 19:17:27 +0200 Subject: [PATCH] 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 Change-Id: Iab618d4b9e325b07a648b91fcdce99c63644fbfc Reviewed-on: https://review.coreboot.org/c/coreboot/+/74196 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- src/cpu/x86/64bit/Makefile.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/cpu/x86/64bit/Makefile.inc b/src/cpu/x86/64bit/Makefile.inc index 48f56fccfd..526291a7fa 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