diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2022-09-12 16:10:58 +0800 |
|---|---|---|
| committer | Arthur Heymans <arthur@aheymans.xyz> | 2022-10-27 13:39:08 +0000 |
| commit | b9a9dcd8d667ef40277f92c9f0dbe6bfa385f64a (patch) | |
| tree | 415a672e716646fe4770ac51f5db9d9cadebc6ca /src/mainboard/lenovo | |
| parent | 6526e78967276e0299e890020267c560223bc90a (diff) | |
mb/lenovo/haswell: Enable VBOOT_VBNV_FLASH
To deprecate VBOOT_VBNV_CMOS [1], replace VBOOT_VBNV_CMOS with
VBOOT_VBNV_FLASH for Haswell.
Currently BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is selected for
CPU_INTEL_HASWELL (see [2]). However, there seems to be no
particular reason on those platforms. Flashconsole works on Broadwell,
at least, and it writes to flash as early as bootblock. Therefore,
remove BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES, so that VBOOT_VBNV_FLASH
can be enabled.
[1] https://issuetracker.google.com/issues/235293589
[2] commit 6c2568f4f58b9a1b209c9af36d7f980fde784f08 (CB:45740)
drivers/spi: Add BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES config
BUG=b:235293589
TEST=./util/abuild/abuild -t LENOVO_THINKPAD_T440P -a (with VBOOT)
Change-Id: If1430ffd6115a0bc151cbe0632cda7fc5f6c26a6
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67540
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/mainboard/lenovo')
| -rw-r--r-- | src/mainboard/lenovo/haswell/Kconfig | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/haswell/vboot-rwab.fmd | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mainboard/lenovo/haswell/Kconfig b/src/mainboard/lenovo/haswell/Kconfig index 897700df15..6a33e23372 100644 --- a/src/mainboard/lenovo/haswell/Kconfig +++ b/src/mainboard/lenovo/haswell/Kconfig @@ -35,7 +35,7 @@ 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 diff --git a/src/mainboard/lenovo/haswell/vboot-rwab.fmd b/src/mainboard/lenovo/haswell/vboot-rwab.fmd index 1747c0e708..e38cd60c28 100644 --- a/src/mainboard/lenovo/haswell/vboot-rwab.fmd +++ b/src/mainboard/lenovo/haswell/vboot-rwab.fmd @@ -19,8 +19,9 @@ FLASH@0xff400000 0xc00000 { RECOVERY_MRC_CACHE@0x0 0x10000 RW_MRC_CACHE@0x10000 0x10000 } + RW_NVRAM(PRESERVE) 0x2000 RW_VPD(PRESERVE) 0x1000 - SMMSTORE(PRESERVE)@0x521000 0x40000 + SMMSTORE(PRESERVE)@0x523000 0x40000 WP_RO { FMAP 0x800 |