[XS] Change in coreboot[main]: Kconfig: Make the SEPARATE_ROMSTAGE default configurable in other files

[Matt DeVillier (Code Review)]

Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80580?usp=email )

Change subject: Kconfig: Make the SEPARATE_ROMSTAGE default configurable in other files
......................................................................

Kconfig: Make the SEPARATE_ROMSTAGE default configurable in other files

This also sets a good default in arch and vboot to have a separate
romstage when it makes sense.

Signed-off-by: Arthur Heymans 
Change-Id: I09ab5f8c79917bf93c9d5c9dfd157c652478b186
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80580
Reviewed-by: Nico Huber 
Reviewed-by: Maximilian Brune 
Reviewed-by: Jérémy Compostella 
Tested-by: build bot (Jenkins) 
---
M src/Kconfig
M src/arch/x86/Kconfig
M src/security/vboot/Kconfig
3 files changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Jérémy Compostella: Looks good to me, but someone else must approve
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, but someone else must approve
  Maximilian Brune: Looks good to me, approved

diff --git a/src/Kconfig b/src/Kconfig
index 2bcc3ce..2afb9db 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -245,7 +245,6 @@

config SEPARATE_ROMSTAGE
    bool "Build a separate romstage"
-	default y
    help
      Build a separate romstage that is loaded by bootblock. With this
      option disabled the romstage sources are linked inside the bootblock
@@ -1538,3 +1537,6 @@
    bool
    default n if RAMPAYLOAD
    default y
+
+config SEPARATE_ROMSTAGE
+	default y
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 0c11653..63f71e5 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -251,8 +251,9 @@
    bool "Always load fallback"

config BOOTBLOCK_NORMAL
-	select CONFIGURABLE_CBFS_PREFIX
    bool "Switch to normal if CMOS says so"
+	select CONFIGURABLE_CBFS_PREFIX
+	select SEPARATE_ROMSTAGE

endchoice

diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index 4bd36f5..d42dc74 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -90,7 +90,7 @@
 config VBOOT_STARTS_IN_BOOTBLOCK
    bool
    default n
-	depends on SEPARATE_ROMSTAGE
+	select SEPARATE_ROMSTAGE
    help
      Firmware verification happens during the end of or right after the
      bootblock. This implies that a static VBOOT2_WORK() buffer must be