diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2019-10-06 15:04:46 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2019-10-08 11:41:06 +0000 |
| commit | c70af6530cc01cf1761543ed516ba7b60c349966 (patch) | |
| tree | df4404fed167e7c22c4379add9dc70b0d5988f64 | |
| parent | 6010eb27c9075549c84020c7f50a6b0ded19dc2d (diff) | |
| download | coreboot-c70af6530cc01cf1761543ed516ba7b60c349966.tar.gz coreboot-c70af6530cc01cf1761543ed516ba7b60c349966.tar.bz2 coreboot-c70af6530cc01cf1761543ed516ba7b60c349966.zip | |
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 <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>
| -rw-r--r-- | src/arch/x86/bootblock_simple.c | 5 |
1 files changed, 0 insertions, 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) |