Julius Werner has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60467 )
Change subject: configs: Add build test configs for CBFS verification ......................................................................
configs: Add build test configs for CBFS verification
Now that CBFS verification is available as an optional feature in menuconfig (CB:59982), we should add build test configs to ensure it doesn't break without notice. One Arm and one x86 board should be good enough for now.
Reshuffle SC7180 memlayout a bit to make things fit (ever since QcLib was switched to LZ4 compression, we haven't needed that much CBFS cache anyway).
Signed-off-by: Julius Werner jwerner@chromium.org Change-Id: I530dfd37472e63b80a67badd22a13d54d2c4621b --- A configs/config.google_trogdor.build_test M configs/config.google_volteer.build_test_purposes M src/soc/qualcomm/sc7180/memlayout.ld 3 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/60467/1
diff --git a/configs/config.google_trogdor.build_test b/configs/config.google_trogdor.build_test new file mode 100644 index 0000000..88c0dd0 --- /dev/null +++ b/configs/config.google_trogdor.build_test @@ -0,0 +1,8 @@ +# Config to build test some optional Kconfigs on an Arm platform +CONFIG_USE_BLOBS=y +CONFIG_USE_QC_BLOBS=y +CONFIG_VENDOR_GOOGLE=y +CONFIG_BOARD_GOOGLE_TROGDOR=y +CONFIG_CBFS_VERIFICATION=y +CONFIG_TPM_MEASURED_BOOT=y +CONFIG_PAYLOAD_NONE=y diff --git a/configs/config.google_volteer.build_test_purposes b/configs/config.google_volteer.build_test_purposes index 8531b79..6843aeb 100644 --- a/configs/config.google_volteer.build_test_purposes +++ b/configs/config.google_volteer.build_test_purposes @@ -30,3 +30,4 @@ CONFIG_DEBUG_CONSOLE_INIT=y CONFIG_DEBUG_SPI_FLASH=y CONFIG_DEBUG_BOOT_STATE=y +CONFIG_CBFS_VERIFICATION=y diff --git a/src/soc/qualcomm/sc7180/memlayout.ld b/src/soc/qualcomm/sc7180/memlayout.ld index 1b9044f..2f4b4e1 100644 --- a/src/soc/qualcomm/sc7180/memlayout.ld +++ b/src/soc/qualcomm/sc7180/memlayout.ld @@ -31,8 +31,8 @@ BSRAM_START(0x14800000) REGION(pbl_timestamps, 0x14800000, 83K, 4K) WATCHDOG_TOMBSTONE(0x14814FFC, 4) - BOOTBLOCK(0x14815000, 40K) - PRERAM_CBFS_CACHE(0x1481F000, 70K) + BOOTBLOCK(0x14815000, 48K) + PRERAM_CBFS_CACHE(0x14821000, 62K) PRERAM_CBMEM_CONSOLE(0x14830800, 32K) TIMESTAMP(0x14838800, 1K) TTB(0x14839000, 56K)