[coreboot-gerrit] Change in ...coreboot[master]: arch/x86/Kconfig: Hide the prefix option on all but BOOTBLOCK_NORMAL

[Arthur Heymans (Code Review)]

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

Change subject: arch/x86/Kconfig: Hide the prefix option on all but BOOTBLOCK_NORMAL
......................................................................

arch/x86/Kconfig: Hide the prefix option on all but BOOTBLOCK_NORMAL

Change-Id: Icf5e8fa18bea1cdfb85b8a4999d8fccea94d16b9
Signed-off-by: Arthur Heymans 
---
M src/Kconfig
M src/arch/x86/Kconfig
M src/arch/x86/bootblock_simple.c
3 files changed, 7 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/33324/1

diff --git a/src/Kconfig b/src/Kconfig
index d30aa99..aa02001 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -32,8 +32,11 @@
      the coreboot version number, so that you can easily distinguish
      boot logs of different boards from each other.

+config USE_CBFS_PREFIX
+       bool
+
 config CBFS_PREFIX
-	string "CBFS prefix to use"
+	string "CBFS prefix to use" if USE_CBFS_PREFIX
    default "fallback"
    help
      Select the prefix to all files put into the image. It's "fallback"
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 827c1cb..36f2277 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -247,6 +247,7 @@
    bool "Always load fallback"

config BOOTBLOCK_NORMAL
+	select USE_CBFS_PREFIX
    bool "Switch to normal if CMOS says so"

endchoice
diff --git a/src/arch/x86/bootblock_simple.c b/src/arch/x86/bootblock_simple.c
index fc041c8..fd328a1 100644
--- a/src/arch/x86/bootblock_simple.c
+++ b/src/arch/x86/bootblock_simple.c
@@ -28,9 +28,9 @@
    }

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

unsigned long entry;