diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2022-06-08 10:23:32 +0800 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-06-22 18:08:53 +0000 |
| commit | 6b0d0851645cf369e2fd08a2d11ffc441df7f7aa (patch) | |
| tree | a68db4074ac79abdc906511d0865619fd9b40d5a /src/mainboard/google/veyron | |
| parent | e399aa8c9cb6e301c6348c5d255cc71892cfde22 (diff) | |
security/vboot: Deprecate VBOOT_VBNV_EC
Boards using VBOOT_VBNV_EC (nyan, daisy, veyron, peach_pit) are all
ChromeOS devices and they've reached the end of life since Feb 2022.
Therefore, remove VBOOT_VBNV_EC for them, each with different
replacement.
- nyan (nyan, nyan_big, nyan_blaze): Add RW_NVRAM to their FMAP (by
reducing the size of RW_VPD), and replace VBOOT_VBNV_EC with
VBOOT_VBNV_FLASH.
- veyron: Add RW_NVRAM to their FMAP (by reducing the size of
SHARED_DATA), and replace VBOOT_VBNV_EC with VBOOT_VBNV_FLASH. Also
enlarge the OVERLAP_VERSTAGE_ROMSTAGE section for rk3288 (by reducing
the size of PRERAM_CBMEM_CONSOLE), so that verstage won't exceed its
allotted size.
- daisy: Because BOOT_DEVICE_SPI_FLASH is not set, which is required for
VBOOT_VBNV_FLASH, disable MAINBOARD_HAS_CHROMEOS and VBOOT configs.
- peach_pit: As VBOOT is not set, simply remove the unused VBOOT_VBNV_EC
option.
Remove the VBOOT_VBNV_EC Kconfig option as well as related code, leaving
VBOOT_VBNV_FLASH and VBOOT_VBNV_CMOS as the only two backend options for
vboot nvdata (VBNV).
Also add a check in read_vbnv() and save_vbnv() for VBNV options.
BUG=b:178689388
TEST=util/abuild/abuild -t GOOGLE_NYAN -x -a
TEST=util/abuild/abuild -t GOOGLE_VEYRON_JAQ -x -a
TEST=util/abuild/abuild -t GOOGLE_DAISY -a
TEST=util/abuild/abuild -t GOOGLE_PEACH_PIT -a
BRANCH=none
Change-Id: Ic67d69e694cff3176dbee12d4c6311bc85295863
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65012
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/mainboard/google/veyron')
| -rw-r--r-- | src/mainboard/google/veyron/Kconfig | 2 | ||||
| -rw-r--r-- | src/mainboard/google/veyron/chromeos.fmd | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig index 0847c410ff..dbd2b8733c 100644 --- a/src/mainboard/google/veyron/Kconfig +++ b/src/mainboard/google/veyron/Kconfig @@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS select MAINBOARD_HAS_TPM1 config VBOOT - select VBOOT_VBNV_EC + select VBOOT_VBNV_FLASH config MAINBOARD_DIR default "google/veyron" diff --git a/src/mainboard/google/veyron/chromeos.fmd b/src/mainboard/google/veyron/chromeos.fmd index ebc6eb137b..df35976d00 100644 --- a/src/mainboard/google/veyron/chromeos.fmd +++ b/src/mainboard/google/veyron/chromeos.fmd @@ -14,9 +14,10 @@ FLASH@0x0 0x400000 { FW_MAIN_A(CBFS)@0x2000 0x75f00 RW_FWID_A@0x77f00 0x100 } - RW_SHARED@0x278000 0x4000 { - SHARED_DATA@0x0 0x4000 + RW_SHARED@0x278000 0x2000 { + SHARED_DATA@0x0 0x2000 } + RW_NVRAM(PRESERVE)@0x27a000 0x2000 RW_ELOG(PRESERVE)@0x27c000 0x4000 RW_SECTION_B@0x280000 0x78000 { VBLOCK_B@0x0 0x2000 |