Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/56289 )
Change subject: mb/google/guybrush: Make VBOOT_STARTS_BEFORE_BOOTBLOCK a default ......................................................................
mb/google/guybrush: Make VBOOT_STARTS_BEFORE_BOOTBLOCK a default
To be able to enable & disable PSP_verstage in the saved .config file, the symbol VBOOT_STARTS_BEFORE_BOOTBLOCK needs to be changed from a select to a default with a prompt.
BUG=182477057 TEST=Build, get PSP_verstage, disable VBOOT_STARTS_BEFORE_BOOTBLOCK, verify that VBOOT_STARTS_IN_BOOTBLOCK is set.
Signed-off-by: Martin Roth martinroth@chromium.org Change-Id: Iba735f33f9b079c9868ef2fff099c5298ff72b6a Reviewed-on: https://review.coreboot.org/c/coreboot/+/56289 Reviewed-by: Karthik Ramasubramanian kramasub@google.com Reviewed-by: Kangheui Won khwon@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/guybrush/Kconfig 1 file changed, 8 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Karthik Ramasubramanian: Looks good to me, approved Kangheui Won: Looks good to me, approved
diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig index f9c577a..b57fc62 100644 --- a/src/mainboard/google/guybrush/Kconfig +++ b/src/mainboard/google/guybrush/Kconfig @@ -48,7 +48,14 @@ config VBOOT select VBOOT_LID_SWITCH select VBOOT_SEPARATE_VERSTAGE - select VBOOT_STARTS_BEFORE_BOOTBLOCK + +config VBOOT_STARTS_BEFORE_BOOTBLOCK + bool "Enable PSP_verstage" + default y if VBOOT + +config VBOOT_STARTS_IN_BOOTBLOCK + bool + default y if VBOOT && !VBOOT_STARTS_BEFORE_BOOTBLOCK
config VBOOT_STARTS_IN_BOOTBLOCK select NO_EARLY_BOOTBLOCK_POSTCODES