[coreboot-gerrit] Change in coreboot[master]: [RFC]arch/x86: Only allow normal and fallback cbfs prefixes

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35823 )

Change subject: [RFC]arch/x86: Only allow normal and fallback cbfs prefixes
......................................................................

[RFC]arch/x86: Only allow normal and fallback cbfs prefixes

Using other cbfsprefixes is errorprone: It requires a properly
formatted cbfs file to be present (an error in the cbfsfile will
render the system unbootable) and to correctly enter the cbfs prefix
in menuconfig. Therefore remove this functionality that merely allows
to use different names.

Change-Id: I7399b144fe122badd53d518543868c6ecb14fe21
Signed-off-by: Arthur Heymans 
---
M src/Kconfig
M src/arch/x86/bootblock_normal.c
2 files changed, 3 insertions(+), 20 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/35823/1

diff --git a/src/Kconfig b/src/Kconfig
index 4c71f28..5b2a615 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -48,13 +48,10 @@
 config CBFS_PREFIX_NORMAL
    bool "normal"

-config CBFS_PREFIX_DIY
-	bool "Define your own cbfs prefix"
-
 endchoice

config CBFS_PREFIX
-	string "CBFS prefix to use" if CBFS_PREFIX_DIY
+	string
    default "fallback" if !CONFIGURABLE_CBFS_PREFIX || CBFS_PREFIX_FALLBACK
    default "normal" if CBFS_PREFIX_NORMAL
    help
diff --git a/src/arch/x86/bootblock_normal.c b/src/arch/x86/bootblock_normal.c
index 905ecb2..c55eda2 100644
--- a/src/arch/x86/bootblock_normal.c
+++ b/src/arch/x86/bootblock_normal.c
@@ -16,18 +16,9 @@
 #include <pc80/mc146818rtc.h>
 #include <halt.h>

-static const char *get_fallback(const char *stagelist)
-{
-	while (*stagelist)
-		stagelist++;
-	return ++stagelist;
-}
-
 static void main(unsigned long bist)
 {
    u8 boot_mode;
-	const char *default_filenames =
-		"normal/romstage\0fallback/romstage";

if (boot_cpu()) {
    	bootblock_mainboard_init();
@@ -44,20 +35,15 @@
    	boot_mode = boot_use_normal(cmos_read(RTC_BOOT_BYTE));
    }

-	char *normal_candidate = (char *)walkcbfs("coreboot-stages");
-
-	if (!normal_candidate)
-		normal_candidate = default_filenames;
-
    unsigned long entry;

if (boot_mode) {
-		entry = findstage(normal_candidate);
+		entry = findstage("normal/romstage");
    	if (entry)
    		call(entry, bist);
    }

-	entry = findstage(get_fallback(normal_candidate));
+	entry = findstage("fallback/romstage");
    if (entry)
    	call(entry, bist);