[coreboot-gerrit] Change in coreboot[master]: arch/x86: Don't allow separate verstage to boot from romcc bootblock

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35824 )

Change subject: arch/x86: Don't allow separate verstage to boot from romcc bootblock
......................................................................

arch/x86: Don't allow separate verstage to boot from romcc bootblock

CONFIG_VBOOT_SEPARATE_VERSTAGE has a dependency on
C_ENVIRONMENT_BOOTBLOCK so Kconfig already guards against this.

Change-Id: I8f963a27f9023fd4c6ebc418059d57e00e4dfb4c
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35824
Reviewed-by: Aaron Durbin 
Reviewed-by: Nico Huber 
Reviewed-by: Kyösti Mälkki 
Tested-by: build bot (Jenkins) 
---
M src/arch/x86/bootblock_simple.c
1 file changed, 0 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved
  Nico Huber: Looks good to me, approved
  Aaron Durbin: Looks good to me, approved

diff --git a/src/arch/x86/bootblock_simple.c b/src/arch/x86/bootblock_simple.c
index fc041c8..d161435 100644
--- a/src/arch/x86/bootblock_simple.c
+++ b/src/arch/x86/bootblock_simple.c
@@ -27,12 +27,7 @@
 #endif
    }

-#if CONFIG(VBOOT_SEPARATE_VERSTAGE)
-	const char *target1 = "fallback/verstage";
-#else
    const char *target1 = "fallback/romstage";
-#endif
-
    unsigned long entry;
    entry = findstage(target1);
    if (entry)