UPSTREAM: soc/amd/{picasso,cezanne}: Enable CBMEM_PRINT_PRE_BOOTBLOCK_CONTENTS
This will help debugging verstage failures.
BUG=b:213828947
TEST=Boot guybrush and verify verstage logs are printed before bootblock
messages.
Change-Id: I95471933292d60598b8b37943174a17ccae2bb27
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Original-Commit-Id: b1a0fcefe4e6742cd29a997d310ccdb62d46a022
Original-Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Original-Change-Id: Ia60991b3e81c19c24ceb69193840dde873ef3346
Original-Reviewed-on: https://review.coreboot.org/c/coreboot/+/61013
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/3399996
Reviewed-by: Rob Barnes <robbarnes@google.com>
Tested-by: Rob Barnes <robbarnes@google.com>
Commit-Queue: Rob Barnes <robbarnes@google.com>
diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig
index 2535ab7..ac12b0b 100644
--- a/src/soc/amd/cezanne/Kconfig
+++ b/src/soc/amd/cezanne/Kconfig
@@ -16,6 +16,7 @@
select ARCH_RAMSTAGE_X86_32
select ARCH_X86
select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH
+ select CONSOLE_CBMEM_PRINT_PRE_BOOTBLOCK_CONTENTS if VBOOT_STARTS_BEFORE_BOOTBLOCK
select DRIVERS_USB_ACPI
select DRIVERS_I2C_DESIGNWARE
select DRIVERS_USB_PCI_XHCI
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index a52ce9a..ec1270b 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -19,6 +19,7 @@
select X86_INIT_NEED_1_SIPI
select ACPI_SOC_NVS
select ADD_FSP_BINARIES if USE_AMD_BLOBS
+ select CONSOLE_CBMEM_PRINT_PRE_BOOTBLOCK_CONTENTS if VBOOT_STARTS_BEFORE_BOOTBLOCK
select DRIVERS_I2C_DESIGNWARE
select DRIVERS_USB_PCI_XHCI
select GENERIC_GPIO_LIB
