summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2024-02-18 14:02:35 +0100
committerMatt DeVillier <matt.devillier@gmail.com>2024-02-27 20:35:11 +0000
commit9bbfafbef89aef741e123349d5f2e1100eefd154 (patch)
treec10c0e009cb53af81eb02ed7af204764d36713a8
parent9f0443c264cd60d77aae5a93dc51346f84e383d0 (diff)
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 <arthur@aheymans.xyz> Change-Id: I09ab5f8c79917bf93c9d5c9dfd157c652478b186 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80580 Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Maximilian Brune <maximilian.brune@9elements.com> Reviewed-by: Jérémy Compostella <jeremy.compostella@intel.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/Kconfig4
-rw-r--r--src/arch/x86/Kconfig3
-rw-r--r--src/security/vboot/Kconfig2
3 files changed, 6 insertions, 3 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 2bcc3ce528..2afb9db177 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -245,7 +245,6 @@ config COMPRESS_BOOTBLOCK
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 @@ config HAVE_RAMSTAGE
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 0c11653675..63f71e5127 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -251,8 +251,9 @@ config BOOTBLOCK_SIMPLE
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 4bd36f50c7..d42dc74c51 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -90,7 +90,7 @@ config VBOOT_STARTS_BEFORE_BOOTBLOCK
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