From c70af6530cc01cf1761543ed516ba7b60c349966 Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Sun, 6 Oct 2019 15:04:46 +0200
Subject: arch/x86: Don't allow separate verstage to boot from romcc bootblock
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35824
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/arch/x86/bootblock_simple.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/arch/x86/bootblock_simple.c b/src/arch/x86/bootblock_simple.c
index fc041c80188d..d16143542401 100644
--- a/src/arch/x86/bootblock_simple.c
+++ b/src/arch/x86/bootblock_simple.c
@@ -27,12 +27,7 @@ static void main(unsigned long bist)
 #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)
-- 
cgit v1.2.3