diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2022-11-14 16:33:42 +0800 |
|---|---|---|
| committer | Yu-Ping Wu <yupingso@google.com> | 2023-03-08 04:13:46 +0000 |
| commit | e930360bbe2239723ea9f7c493860053a069e71f (patch) | |
| tree | e8123a6c4aa8830dc466585ef9cdfe058f77a459 /src/mainboard/lenovo/x60 | |
| parent | 66c1d0dd3252b39220a4c50b7a4571cac82d6209 (diff) | |
mb/lenovo: Enable VBOOT_VBNV_FLASH
To deprecate VBOOT_VBNV_CMOS [1], replace VBOOT_VBNV_CMOS with
VBOOT_VBNV_FLASH for lenovo boards: t400, t410, t420, t420s, t430,
t430s, t520, t530, x131e, x1_carbon_gen1, x60, x200, x201, x220, x230. A
0x2000 RW_NVRAM region is allocated for them, with the COREBOOT size
reduced by 0x2000.
Also remove the VBOOT_VBNV_OFFSET config, since it's only used for
VBOOT_VBNV_CMOS.
[1] https://web.archive.org/web/20230115020833/https://issuetracker.google.com/issues/235293589?pli=1
BUG=b:235293589
TEST=./util/abuild/abuild -t LENOVO_T430S -a # with VBOOT enabled
Change-Id: I7e29db7eeceec499fbbcf902a26bfe9a2076de40
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72809
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yidi Lin <yidilin@google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Diffstat (limited to 'src/mainboard/lenovo/x60')
| -rw-r--r-- | src/mainboard/lenovo/x60/Kconfig | 6 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x60/vboot-rwa.fmd | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index d5b5f33366..88010c8a6e 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS select INTEL_GMA_HAVE_VBT config VBOOT - select VBOOT_VBNV_CMOS + select VBOOT_VBNV_FLASH select GBB_FLAG_DISABLE_LID_SHUTDOWN select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC @@ -35,10 +35,6 @@ config VBOOT config VBOOT_SLOTS_RW_A default y -config VBOOT_VBNV_OFFSET - hex - default 0x76 - config FMDFILE default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT diff --git a/src/mainboard/lenovo/x60/vboot-rwa.fmd b/src/mainboard/lenovo/x60/vboot-rwa.fmd index b21cff3b3a..eabae66908 100644 --- a/src/mainboard/lenovo/x60/vboot-rwa.fmd +++ b/src/mainboard/lenovo/x60/vboot-rwa.fmd @@ -6,6 +6,7 @@ FLASH@0xffe00000 0x200000 { RW_FWID_A 0x40 } RW_VPD(PRESERVE) 0x1000 + RW_NVRAM(PRESERVE) 0x2000 CONSOLE 0x10000 WP_RO { FMAP 0x800 |