GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Yu-Ping Wu 2022-11-14 16:33:42 +08:00 committed by Yu-Ping Wu
parent 66c1d0dd32
commit e930360bbe
31 changed files with 38 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainboard/lenovo/haswell/Kconfig
View File

@ -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

6
src/mainboard/lenovo/t400/Kconfig
View File

@ -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

1
src/mainboard/lenovo/t400/vboot-rwa.fmd
View File

@ -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 {

6
src/mainboard/lenovo/t410/Kconfig
View File

@ -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

1
src/mainboard/lenovo/t410/vboot-rwa.fmd
View File

@ -16,6 +16,7 @@ FLASH@0xff800000 0x800000 {
}
RW_VPD(PRESERVE) 0x1000
SMMSTORE(PRESERVE) 0x40000
RW_NVRAM(PRESERVE) 0x2000
WP_RO {
RO_VPD(PRESERVE) 0x1000

6
src/mainboard/lenovo/t420/Kconfig
View File

@ -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

5
src/mainboard/lenovo/t420/vboot-rwa.fmd
View File

@ -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
}
}
}

6
src/mainboard/lenovo/t420s/Kconfig
View File

@ -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

5
src/mainboard/lenovo/t420s/vboot-rwa.fmd
View File

@ -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
}
}
}

6
src/mainboard/lenovo/t430/Kconfig
View File

@ -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

1
src/mainboard/lenovo/t430/vboot-rwab.fmd
View File

@ -21,6 +21,7 @@ FLASH@0xff400000 0xc00000 {
}
RW_VPD(PRESERVE) 0x1000
SMMSTORE(PRESERVE)@0x521000 0x40000
RW_NVRAM(PRESERVE)@0x561000 0x2000
WP_RO {
FMAP 0x800

6
src/mainboard/lenovo/t430s/Kconfig
View File

@ -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

1
src/mainboard/lenovo/t430s/vboot-rwab.fmd
View File

@ -21,6 +21,7 @@ FLASH@0xff400000 0xc00000 {
}
RW_VPD(PRESERVE) 0x1000
SMMSTORE(PRESERVE)@0x521000 0x40000
RW_NVRAM(PRESERVE)@0x561000 0x2000
WP_RO {
FMAP 0x800

6
src/mainboard/lenovo/t520/Kconfig
View File

@ -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

5
src/mainboard/lenovo/t520/vboot-rwa.fmd
View File

@ -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
}
}
}

6
src/mainboard/lenovo/t530/Kconfig
View File

@ -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

1
src/mainboard/lenovo/t530/vboot-rwab.fmd
View File

@ -21,6 +21,7 @@ FLASH@0xff400000 0xc00000 {
}
RW_VPD(PRESERVE) 0x1000
SMMSTORE(PRESERVE)@0x521000 0x40000
RW_NVRAM(PRESERVE)@0x561000 0x2000
WP_RO {
FMAP 0x800

6
src/mainboard/lenovo/x131e/Kconfig
View File

@ -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

1
src/mainboard/lenovo/x131e/vboot-rwab.fmd
View File

@ -21,6 +21,7 @@ FLASH@0xff400000 0xc00000 {
}
RW_VPD(PRESERVE) 0x1000
SMMSTORE(PRESERVE)@0x521000 0x40000
RW_NVRAM(PRESERVE)@0x561000 0x2000
WP_RO {
FMAP 0x800

6
src/mainboard/lenovo/x1_carbon_gen1/Kconfig
View File

@ -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

1
src/mainboard/lenovo/x1_carbon_gen1/vboot-rwab.fmd
View File

@ -21,6 +21,7 @@ FLASH@0xff400000 0xc00000 {
}
RW_VPD(PRESERVE) 0x1000
SMMSTORE(PRESERVE)@0x521000 0x40000
RW_NVRAM(PRESERVE)@0x561000 0x2000
WP_RO {
FMAP 0x800

6
src/mainboard/lenovo/x200/Kconfig
View File

@ -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

1
src/mainboard/lenovo/x200/vboot-rwa.fmd
View File

@ -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 {

6
src/mainboard/lenovo/x201/Kconfig
View File

@ -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

1
src/mainboard/lenovo/x201/vboot-rwa.fmd
View File

@ -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 {

6
src/mainboard/lenovo/x220/Kconfig
View File

@ -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"

5
src/mainboard/lenovo/x220/vboot-rwa.fmd
View File

@ -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
}
}
}

6
src/mainboard/lenovo/x230/Kconfig
View File

@ -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

1
src/mainboard/lenovo/x230/vboot-rwab.fmd
View File

@ -21,6 +21,7 @@ FLASH@0xff400000 0xc00000 {
}
RW_VPD(PRESERVE) 0x1000
SMMSTORE(PRESERVE)@0x521000 0x40000
RW_NVRAM(PRESERVE)@0x561000 0x2000
WP_RO {
FMAP 0x800

6
src/mainboard/lenovo/x60/Kconfig
View File

@ -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

1
src/mainboard/lenovo/x60/vboot-rwa.fmd
View File

@ -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