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>

31 files changed, 38 insertions, 87 deletions

diff --git a/src/mainboard/lenovo/haswell/Kconfig b/src/mainboard/lenovo/haswell/Kconfig
index 6a33e2337244..486baf05ca08 100644
--- a/src/mainboard/lenovo/haswell/Kconfig
+++ b/src/mainboard/lenovo/haswell/Kconfig
@@ -40,10 +40,6 @@ config VBOOT
 config VBOOT_SLOTS_RW_AB
 	default y
 
-config VBOOT_VBNV_OFFSET
-	hex
-	default 0x2a
-
 config VARIANT_DIR
 	default "t440p" if BOARD_LENOVO_THINKPAD_T440P
 	default "w541" if BOARD_LENOVO_THINKPAD_W541
diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig
index 7854bbff94c4..776dcfa9a919 100644
--- a/src/mainboard/lenovo/t400/Kconfig
+++ b/src/mainboard/lenovo/t400/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 0x82
-
 config FMDFILE
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
 
diff --git a/src/mainboard/lenovo/t400/vboot-rwa.fmd b/src/mainboard/lenovo/t400/vboot-rwa.fmd
index 4af3fcd2d6f5..4acae85e4cab 100644
--- a/src/mainboard/lenovo/t400/vboot-rwa.fmd
+++ b/src/mainboard/lenovo/t400/vboot-rwa.fmd
@@ -12,6 +12,7 @@ FLASH@0xff800000 0x800000 {
 			RW_FWID_A 0x40
 		}
 		RW_VPD(PRESERVE) 0x1000
+		RW_NVRAM(PRESERVE) 0x2000
 		CONSOLE 0x10000
 		SMMSTORE(PRESERVE) 0x40000
 		WP_RO {
diff --git a/src/mainboard/lenovo/t410/Kconfig b/src/mainboard/lenovo/t410/Kconfig
index 3495d664de78..23f9a883cd8c 100644
--- a/src/mainboard/lenovo/t410/Kconfig
+++ b/src/mainboard/lenovo/t410/Kconfig
@@ -25,7 +25,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_RICOH_RCE822
 
 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 0x2a
-
 config CBFS_SIZE
 	default 0x300000
 
diff --git a/src/mainboard/lenovo/t410/vboot-rwa.fmd b/src/mainboard/lenovo/t410/vboot-rwa.fmd
index 8f50d33fbbd6..b7d75c09100d 100644
--- a/src/mainboard/lenovo/t410/vboot-rwa.fmd
+++ b/src/mainboard/lenovo/t410/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
diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig
index b82f45ab8ea2..da7ebb5adcd0 100644
--- a/src/mainboard/lenovo/t420/Kconfig
+++ b/src/mainboard/lenovo/t420/Kconfig
@@ -29,7 +29,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SERIRQ_CONTINUOUS_MODE
 
 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
@@ -39,10 +39,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/t420/vboot-rwa.fmd b/src/mainboard/lenovo/t420/vboot-rwa.fmd
index 8a4cd3b47764..4bd4b865282d 100644
--- a/src/mainboard/lenovo/t420/vboot-rwa.fmd
+++ b/src/mainboard/lenovo/t420/vboot-rwa.fmd
@@ -16,14 +16,15 @@ FLASH@0xff800000 0x800000 {
 		}
 		RW_VPD(PRESERVE)@0x1a0000 0x1000
 		SMMSTORE(PRESERVE)@0x1a1000 0x40000
+		RW_NVRAM(PRESERVE)@0x1e1000 0x2000
 
-		WP_RO@0x1e1000 0x11f000 {
+		WP_RO@0x1e3000 0x11d000 {
 			FMAP@0x0 0x800
 			RO_FRID@0x800 0x40
 			RO_PADDING@0x840 0x7c0
 			RO_VPD(PRESERVE)@0x1000 0x1000
 			GBB@0x2000 0x1e000
-			COREBOOT(CBFS)@0x20000 0xff000
+			COREBOOT(CBFS)@0x20000 0xfd000
 		}
 	}
 }
diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig
index 40455062f3fc..188e0704074c 100644
--- a/src/mainboard/lenovo/t420s/Kconfig
+++ b/src/mainboard/lenovo/t420s/Kconfig
@@ -32,15 +32,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_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/t420s/vboot-rwa.fmd b/src/mainboard/lenovo/t420s/vboot-rwa.fmd
index 8a4cd3b47764..4bd4b865282d 100644
--- a/src/mainboard/lenovo/t420s/vboot-rwa.fmd
+++ b/src/mainboard/lenovo/t420s/vboot-rwa.fmd
@@ -16,14 +16,15 @@ FLASH@0xff800000 0x800000 {
 		}
 		RW_VPD(PRESERVE)@0x1a0000 0x1000
 		SMMSTORE(PRESERVE)@0x1a1000 0x40000
+		RW_NVRAM(PRESERVE)@0x1e1000 0x2000
 
-		WP_RO@0x1e1000 0x11f000 {
+		WP_RO@0x1e3000 0x11d000 {
 			FMAP@0x0 0x800
 			RO_FRID@0x800 0x40
 			RO_PADDING@0x840 0x7c0
 			RO_VPD(PRESERVE)@0x1000 0x1000
 			GBB@0x2000 0x1e000
-			COREBOOT(CBFS)@0x20000 0xff000
+			COREBOOT(CBFS)@0x20000 0xfd000
 		}
 	}
 }
diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig
index cfa828361cea..b97ee7386430 100644
--- a/src/mainboard/lenovo/t430/Kconfig
+++ b/src/mainboard/lenovo/t430/Kconfig
@@ -32,15 +32,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/t430/vboot-rwab.fmd b/src/mainboard/lenovo/t430/vboot-rwab.fmd
index 1747c0e7088d..13df4f6c67aa 100644
--- a/src/mainboard/lenovo/t430/vboot-rwab.fmd
+++ b/src/mainboard/lenovo/t430/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
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig
index 373d08f15768..1ed45e7cf440 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SERIRQ_CONTINUOUS_MODE
 
 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
@@ -40,10 +40,6 @@ config VBOOT
 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/t430s/vboot-rwab.fmd b/src/mainboard/lenovo/t430s/vboot-rwab.fmd
index 1747c0e7088d..13df4f6c67aa 100644
--- a/src/mainboard/lenovo/t430s/vboot-rwab.fmd
+++ b/src/mainboard/lenovo/t430s/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
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index 81a1e30d0479..a5af0db757dd 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -28,7 +28,7 @@ config BOARD_LENOVO_BASEBOARD_T520
 if BOARD_LENOVO_BASEBOARD_T520
 
 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
@@ -38,10 +38,6 @@ config VBOOT
 config VBOOT_SLOTS_RW_A
 	default y
 
-config VBOOT_VBNV_OFFSET
-	hex
-	default 0x2a
-
 config VARIANT_DIR
 	default "t520" if BOARD_LENOVO_T520
 	default "w520" if BOARD_LENOVO_W520
diff --git a/src/mainboard/lenovo/t520/vboot-rwa.fmd b/src/mainboard/lenovo/t520/vboot-rwa.fmd
index 8a4cd3b47764..4bd4b865282d 100644
--- a/src/mainboard/lenovo/t520/vboot-rwa.fmd
+++ b/src/mainboard/lenovo/t520/vboot-rwa.fmd
@@ -16,14 +16,15 @@ FLASH@0xff800000 0x800000 {
 		}
 		RW_VPD(PRESERVE)@0x1a0000 0x1000
 		SMMSTORE(PRESERVE)@0x1a1000 0x40000
+		RW_NVRAM(PRESERVE)@0x1e1000 0x2000
 
-		WP_RO@0x1e1000 0x11f000 {
+		WP_RO@0x1e3000 0x11d000 {
 			FMAP@0x0 0x800
 			RO_FRID@0x800 0x40
 			RO_PADDING@0x840 0x7c0
 			RO_VPD(PRESERVE)@0x1000 0x1000
 			GBB@0x2000 0x1e000
-			COREBOOT(CBFS)@0x20000 0xff000
+			COREBOOT(CBFS)@0x20000 0xfd000
 		}
 	}
 }
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index 39d37e95aafb..0267dcf2e828 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -39,15 +39,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/t530/vboot-rwab.fmd b/src/mainboard/lenovo/t530/vboot-rwab.fmd
index 1747c0e7088d..13df4f6c67aa 100644
--- a/src/mainboard/lenovo/t530/vboot-rwab.fmd
+++ b/src/mainboard/lenovo/t530/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
diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig
index 872249e87ad2..657c813e4bea 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 1747c0e7088d..13df4f6c67aa 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
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
index 451d8192a2ea..571c55ab406e 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
@@ -32,15 +32,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/x1_carbon_gen1/vboot-rwab.fmd b/src/mainboard/lenovo/x1_carbon_gen1/vboot-rwab.fmd
index 1747c0e7088d..13df4f6c67aa 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/vboot-rwab.fmd
+++ b/src/mainboard/lenovo/x1_carbon_gen1/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
diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig
index 86693009a2fa..6b22fb30b0f3 100644
--- a/src/mainboard/lenovo/x200/Kconfig
+++ b/src/mainboard/lenovo/x200/Kconfig
@@ -23,7 +23,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_USES_IFD_GBE_REGION
 
 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
@@ -32,10 +32,6 @@ config VBOOT
 config VBOOT_SLOTS_RW_A
 	default y
 
-config VBOOT_VBNV_OFFSET
-	hex
-	default 0x82
-
 config FMDFILE
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
 
diff --git a/src/mainboard/lenovo/x200/vboot-rwa.fmd b/src/mainboard/lenovo/x200/vboot-rwa.fmd
index 4af3fcd2d6f5..4acae85e4cab 100644
--- a/src/mainboard/lenovo/x200/vboot-rwa.fmd
+++ b/src/mainboard/lenovo/x200/vboot-rwa.fmd
@@ -12,6 +12,7 @@ FLASH@0xff800000 0x800000 {
 			RW_FWID_A 0x40
 		}
 		RW_VPD(PRESERVE) 0x1000
+		RW_NVRAM(PRESERVE) 0x2000
 		CONSOLE 0x10000
 		SMMSTORE(PRESERVE) 0x40000
 		WP_RO {
diff --git a/src/mainboard/lenovo/x201/Kconfig b/src/mainboard/lenovo/x201/Kconfig
index abc2352e0cce..3e461a41b33c 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 0d1aa5df1330..f3c0042418fc 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 {
diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig
index d51deaea1433..eeb55b43939c 100644
--- a/src/mainboard/lenovo/x220/Kconfig
+++ b/src/mainboard/lenovo/x220/Kconfig
@@ -32,15 +32,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_A
 	default y
 
-config VBOOT_VBNV_OFFSET
-	hex
-	default 0x2a
-
 config MAINBOARD_DIR
 	default "lenovo/x220"
 
diff --git a/src/mainboard/lenovo/x220/vboot-rwa.fmd b/src/mainboard/lenovo/x220/vboot-rwa.fmd
index 8a4cd3b47764..4bd4b865282d 100644
--- a/src/mainboard/lenovo/x220/vboot-rwa.fmd
+++ b/src/mainboard/lenovo/x220/vboot-rwa.fmd
@@ -16,14 +16,15 @@ FLASH@0xff800000 0x800000 {
 		}
 		RW_VPD(PRESERVE)@0x1a0000 0x1000
 		SMMSTORE(PRESERVE)@0x1a1000 0x40000
+		RW_NVRAM(PRESERVE)@0x1e1000 0x2000
 
-		WP_RO@0x1e1000 0x11f000 {
+		WP_RO@0x1e3000 0x11d000 {
 			FMAP@0x0 0x800
 			RO_FRID@0x800 0x40
 			RO_PADDING@0x840 0x7c0
 			RO_VPD(PRESERVE)@0x1000 0x1000
 			GBB@0x2000 0x1e000
-			COREBOOT(CBFS)@0x20000 0xff000
+			COREBOOT(CBFS)@0x20000 0xfd000
 		}
 	}
 }
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index f9667267d59d..279095629bed 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SERIRQ_CONTINUOUS_MODE
 
 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
@@ -40,10 +40,6 @@ config VBOOT
 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/x230/vboot-rwab.fmd b/src/mainboard/lenovo/x230/vboot-rwab.fmd
index 1747c0e7088d..13df4f6c67aa 100644
--- a/src/mainboard/lenovo/x230/vboot-rwab.fmd
+++ b/src/mainboard/lenovo/x230/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
diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig
index d5b5f3336632..88010c8a6e72 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 b21cff3b3a93..eabae66908d4 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