diff --git a/src/Kconfig b/src/Kconfig
index 5d74d671b2..72d826f43f 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -32,8 +32,13 @@ config LOCALVERSION
 	  the coreboot version number, so that you can easily distinguish
 	  boot logs of different boards from each other.
 
+config CONFIGURABLE_CBFS_PREFIX
+	bool
+	help
+	  Select this to prompt to use to configure the prefix for cbfs files.
+
 config CBFS_PREFIX
-	string "CBFS prefix to use"
+	string "CBFS prefix to use" if CONFIGURABLE_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 827c1cba02..5b1304fedb 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -247,6 +247,7 @@ config BOOTBLOCK_SIMPLE
 	bool "Always load fallback"
 
 config BOOTBLOCK_NORMAL
+	select CONFIGURABLE_CBFS_PREFIX
 	bool "Switch to normal if CMOS says so"
 
 endchoice