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/x201/Kconfig | 6 +----- src/mainboard/lenovo/x201/vboot-rwa.fmd | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/mainboard/lenovo/x201') diff --git a/src/mainboard/lenovo/x201/Kconfig b/src/mainboard/lenovo/x201/Kconfig index abc2352e0c..3e461a41b3 100644 --- a/src/mainboard/lenovo/x201/Kconfig +++ b/src/mainboard/lenovo/x201/Kconfig @@ -24,7 +24,7 @@ config BOARD_SPECIFIC_OPTIONS select H8_HAS_BAT_THRESHOLDS_IMPL 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 @@ -34,10 +34,6 @@ config VBOOT config VBOOT_SLOTS_RW_A default y -config VBOOT_VBNV_OFFSET - hex - default 0x2a - config FMDFILE default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT diff --git a/src/mainboard/lenovo/x201/vboot-rwa.fmd b/src/mainboard/lenovo/x201/vboot-rwa.fmd index 0d1aa5df13..f3c0042418 100644 --- a/src/mainboard/lenovo/x201/vboot-rwa.fmd +++ b/src/mainboard/lenovo/x201/vboot-rwa.fmd @@ -16,6 +16,7 @@ FLASH@0xff800000 0x800000 { } RW_VPD(PRESERVE) 0x1000 SMMSTORE(PRESERVE) 0x40000 + RW_NVRAM(PRESERVE) 0x2000 WP_RO { RO_VPD(PRESERVE) 0x1000 RO_SECTION { -- cgit v1.2.3