From e930360bbe2239723ea9f7c493860053a069e71f Mon Sep 17 00:00:00 2001 From: Yu-Ping Wu Date: Mon, 14 Nov 2022 16:33:42 +0800 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/72809 Tested-by: build bot (Jenkins) Reviewed-by: Yidi Lin Reviewed-by: Angel Pons Reviewed-by: Eric Lai --- src/mainboard/lenovo/x131e/Kconfig | 6 +----- src/mainboard/lenovo/x131e/vboot-rwab.fmd | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/mainboard/lenovo/x131e') diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig index 872249e87a..657c813e4b 100644 --- a/src/mainboard/lenovo/x131e/Kconfig +++ b/src/mainboard/lenovo/x131e/Kconfig @@ -27,15 +27,11 @@ config VBOOT select GBB_FLAG_DISABLE_LID_SHUTDOWN select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC select HAS_RECOVERY_MRC_CACHE - select VBOOT_VBNV_CMOS + select VBOOT_VBNV_FLASH config VBOOT_SLOTS_RW_AB default y -config VBOOT_VBNV_OFFSET - hex - default 0x2a - config FMDFILE default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT diff --git a/src/mainboard/lenovo/x131e/vboot-rwab.fmd b/src/mainboard/lenovo/x131e/vboot-rwab.fmd index 1747c0e708..13df4f6c67 100644 --- a/src/mainboard/lenovo/x131e/vboot-rwab.fmd +++ b/src/mainboard/lenovo/x131e/vboot-rwab.fmd @@ -21,6 +21,7 @@ FLASH@0xff400000 0xc00000 { } RW_VPD(PRESERVE) 0x1000 SMMSTORE(PRESERVE)@0x521000 0x40000 + RW_NVRAM(PRESERVE)@0x561000 0x2000 WP_RO { FMAP 0x800 -- cgit v1.2.3