Attention is currently required from: Alexander Couzens.
Yu-Ping Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/70296 )
Change subject: Enable VBOOT_VBNV_FLASH for CPU_INTEL_MODEL_206AX ......................................................................
Enable VBOOT_VBNV_FLASH for CPU_INTEL_MODEL_206AX
To deprecate VBOOT_VBNV_CMOS [1], replace VBOOT_VBNV_CMOS with VBOOT_VBNV_FLASH for boards using CPU_INTEL_MODEL_206AX.
Currently BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is selected for CPU_INTEL_HASWELL, CPU_INTEL_MODEL_206AX and others (see [2]). However, there seems to be no particular reason on those platforms. We've dropped the config for haswell. Now do the same for CPU_INTEL_MODEL_206AX, so that VBOOT_VBNV_FLASH can be enabled.
VBOOT_VBNV_FLASH is enabled for the following boards:
- Google boards: butterfly, link, lumpy, parrot, stout, stumpy. Use the unused flash space for RW_NVRAM. - Lenovo boards: t420, t420s, t430, t430s, t520, t530, x131e x1_carbon_gen1, x220, x230. A 0x2000 RW_NVRAM region is allocated for them, with the COREBOOT size reduced by 0x2000.
Also remove a VBOOT_VBNV_CMOS comment in emeraldlake2 Kconfig.
[1] https://issuetracker.google.com/issues/235293589 [2] commit 6c2568f4f58b9a1b209c9af36d7f980fde784f08 (CB:45740) drivers/spi: Add BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES config
Change-Id: I833edd4f7a328b21e81c971ba8a9aec0aad7d3d3 Signed-off-by: Yu-Ping Wu yupingso@chromium.org --- M src/cpu/intel/model_206ax/Kconfig M src/mainboard/google/butterfly/Kconfig M src/mainboard/google/butterfly/chromeos.fmd M src/mainboard/google/link/Kconfig M src/mainboard/google/link/chromeos.fmd M src/mainboard/google/parrot/Kconfig M src/mainboard/google/parrot/chromeos.fmd M src/mainboard/google/stout/Kconfig M src/mainboard/google/stout/chromeos.fmd M src/mainboard/intel/emeraldlake2/Kconfig M src/mainboard/lenovo/t420/Kconfig M src/mainboard/lenovo/t420/vboot-rwa.fmd M src/mainboard/lenovo/t420s/Kconfig M src/mainboard/lenovo/t420s/vboot-rwa.fmd M src/mainboard/lenovo/t430/Kconfig M src/mainboard/lenovo/t430/vboot-rwab.fmd M src/mainboard/lenovo/t430s/Kconfig M src/mainboard/lenovo/t430s/vboot-rwab.fmd M src/mainboard/lenovo/t520/Kconfig M src/mainboard/lenovo/t520/vboot-rwa.fmd M src/mainboard/lenovo/t530/Kconfig M src/mainboard/lenovo/t530/vboot-rwab.fmd M src/mainboard/lenovo/x131e/Kconfig M src/mainboard/lenovo/x131e/vboot-rwab.fmd M src/mainboard/lenovo/x1_carbon_gen1/Kconfig M src/mainboard/lenovo/x1_carbon_gen1/vboot-rwab.fmd M src/mainboard/lenovo/x220/Kconfig M src/mainboard/lenovo/x220/vboot-rwa.fmd M src/mainboard/lenovo/x230/Kconfig M src/mainboard/lenovo/x230/vboot-rwab.fmd M src/mainboard/samsung/lumpy/Kconfig M src/mainboard/samsung/lumpy/chromeos.fmd M src/mainboard/samsung/stumpy/Kconfig M src/mainboard/samsung/stumpy/chromeos.fmd 34 files changed, 75 insertions(+), 32 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/70296/1
diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig index c168c9b..032450d 100644 --- a/src/cpu/intel/model_206ax/Kconfig +++ b/src/cpu/intel/model_206ax/Kconfig @@ -6,7 +6,6 @@ config CPU_SPECIFIC_OPTIONS def_bool y select ARCH_X86 - select BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES select HAVE_EXP_X86_64_SUPPORT if USE_NATIVE_RAMINIT select MMX select SSE2 diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index 49ac7d2..8444afc 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -23,7 +23,7 @@ select SYSTEM_TYPE_LAPTOP
config VBOOT - select VBOOT_VBNV_CMOS + select VBOOT_VBNV_FLASH
config MAINBOARD_DIR default "google/butterfly" diff --git a/src/mainboard/google/butterfly/chromeos.fmd b/src/mainboard/google/butterfly/chromeos.fmd index 93048a3..d8b092d 100644 --- a/src/mainboard/google/butterfly/chromeos.fmd +++ b/src/mainboard/google/butterfly/chromeos.fmd @@ -22,7 +22,7 @@ } RW_ENVIRONMENT@0x1f8000 0x4000 RW_VPD(PRESERVE)@0x1fc000 0x2000 - RW_UNUSED@0x1fe000 0x2000 + RW_NVRAM(PRESERVE)@0x1fe000 0x2000 SMMSTORE(PRESERVE)@0x200000 0x40000 RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index e6e4b0b..511a152 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -23,7 +23,7 @@ config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_LID_SWITCH - select VBOOT_VBNV_CMOS + select VBOOT_VBNV_FLASH
config MAINBOARD_DIR default "google/link" diff --git a/src/mainboard/google/link/chromeos.fmd b/src/mainboard/google/link/chromeos.fmd index 3841445..0980639 100644 --- a/src/mainboard/google/link/chromeos.fmd +++ b/src/mainboard/google/link/chromeos.fmd @@ -21,7 +21,7 @@ VBLOCK_DEV@0x2000 0x2000 } RW_VPD(PRESERVE)@0x1f8000 0x2000 - RW_UNUSED@0x1fa000 0x6000 + RW_NVRAM(PRESERVE)@0x1fa000 0x6000 SMMSTORE(PRESERVE)@0x200000 0x40000 RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index dd6df3e..bae827f 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -24,7 +24,7 @@ select SYSTEM_TYPE_LAPTOP
config VBOOT - select VBOOT_VBNV_CMOS + select VBOOT_VBNV_FLASH
config MAINBOARD_DIR default "google/parrot" diff --git a/src/mainboard/google/parrot/chromeos.fmd b/src/mainboard/google/parrot/chromeos.fmd index 6752888..066c78a 100644 --- a/src/mainboard/google/parrot/chromeos.fmd +++ b/src/mainboard/google/parrot/chromeos.fmd @@ -22,7 +22,7 @@ } RW_ENVIRONMENT@0x1f8000 0x4000 RW_VPD(PRESERVE)@0x1fc000 0x2000 - RW_UNUSED@0x1fe000 0x2000 + RW_NVRAM(PRESERVE)@0x1fe000 0x2000 SMMSTORE(PRESERVE)@0x200000 0x40000 RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig index 152c57f..2b2381c 100644 --- a/src/mainboard/google/stout/Kconfig +++ b/src/mainboard/google/stout/Kconfig @@ -22,7 +22,7 @@ select SYSTEM_TYPE_LAPTOP
config VBOOT - select VBOOT_VBNV_CMOS + select VBOOT_VBNV_FLASH
config MAINBOARD_DIR default "google/stout" diff --git a/src/mainboard/google/stout/chromeos.fmd b/src/mainboard/google/stout/chromeos.fmd index 93048a3..d8b092d 100644 --- a/src/mainboard/google/stout/chromeos.fmd +++ b/src/mainboard/google/stout/chromeos.fmd @@ -22,7 +22,7 @@ } RW_ENVIRONMENT@0x1f8000 0x4000 RW_VPD(PRESERVE)@0x1fc000 0x2000 - RW_UNUSED@0x1fe000 0x2000 + RW_NVRAM(PRESERVE)@0x1fe000 0x2000 SMMSTORE(PRESERVE)@0x200000 0x40000 RW_LEGACY(CBFS)@0x240000 0x1c0000 WP_RO@0x400000 0x200000 { diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig index 86fe98a..42d95ea 100644 --- a/src/mainboard/intel/emeraldlake2/Kconfig +++ b/src/mainboard/intel/emeraldlake2/Kconfig @@ -15,7 +15,6 @@ #select MAINBOARD_HAS_CHROMEOS
config VBOOT - #select VBOOT_VBNV_CMOS
config MAINBOARD_DIR default "intel/emeraldlake2" diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig index b82f45a..4fe2f8a 100644 --- a/src/mainboard/lenovo/t420/Kconfig +++ b/src/mainboard/lenovo/t420/Kconfig @@ -29,7 +29,7 @@ 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 diff --git a/src/mainboard/lenovo/t420/vboot-rwa.fmd b/src/mainboard/lenovo/t420/vboot-rwa.fmd index 8a4cd3b..4bd4b86 100644 --- a/src/mainboard/lenovo/t420/vboot-rwa.fmd +++ b/src/mainboard/lenovo/t420/vboot-rwa.fmd @@ -16,14 +16,15 @@ } 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 4045506..7b4f9d9 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/src/mainboard/lenovo/t420s/Kconfig @@ -32,7 +32,7 @@ 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 diff --git a/src/mainboard/lenovo/t420s/vboot-rwa.fmd b/src/mainboard/lenovo/t420s/vboot-rwa.fmd index 8a4cd3b..4bd4b86 100644 --- a/src/mainboard/lenovo/t420s/vboot-rwa.fmd +++ b/src/mainboard/lenovo/t420s/vboot-rwa.fmd @@ -16,14 +16,15 @@ } 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 cfa8283..748a6c4 100644 --- a/src/mainboard/lenovo/t430/Kconfig +++ b/src/mainboard/lenovo/t430/Kconfig @@ -32,7 +32,7 @@ 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/t430/vboot-rwab.fmd b/src/mainboard/lenovo/t430/vboot-rwab.fmd index 1747c0e..13df4f6 100644 --- a/src/mainboard/lenovo/t430/vboot-rwab.fmd +++ b/src/mainboard/lenovo/t430/vboot-rwab.fmd @@ -21,6 +21,7 @@ } 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 373d08f..fbb9968 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/src/mainboard/lenovo/t430s/Kconfig @@ -30,7 +30,7 @@ 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 diff --git a/src/mainboard/lenovo/t430s/vboot-rwab.fmd b/src/mainboard/lenovo/t430s/vboot-rwab.fmd index 1747c0e..13df4f6 100644 --- a/src/mainboard/lenovo/t430s/vboot-rwab.fmd +++ b/src/mainboard/lenovo/t430s/vboot-rwab.fmd @@ -21,6 +21,7 @@ } 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 81a1e30d..343e6be 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -28,7 +28,7 @@ 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 diff --git a/src/mainboard/lenovo/t520/vboot-rwa.fmd b/src/mainboard/lenovo/t520/vboot-rwa.fmd index 8a4cd3b..4bd4b86 100644 --- a/src/mainboard/lenovo/t520/vboot-rwa.fmd +++ b/src/mainboard/lenovo/t520/vboot-rwa.fmd @@ -16,14 +16,15 @@ } 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 39d37e9..d323097 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -39,7 +39,7 @@ 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/t530/vboot-rwab.fmd b/src/mainboard/lenovo/t530/vboot-rwab.fmd index 1747c0e..13df4f6 100644 --- a/src/mainboard/lenovo/t530/vboot-rwab.fmd +++ b/src/mainboard/lenovo/t530/vboot-rwab.fmd @@ -21,6 +21,7 @@ } 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 872249e..08dffcc 100644 --- a/src/mainboard/lenovo/x131e/Kconfig +++ b/src/mainboard/lenovo/x131e/Kconfig @@ -27,7 +27,7 @@ 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/x131e/vboot-rwab.fmd b/src/mainboard/lenovo/x131e/vboot-rwab.fmd index 1747c0e..13df4f6 100644 --- a/src/mainboard/lenovo/x131e/vboot-rwab.fmd +++ b/src/mainboard/lenovo/x131e/vboot-rwab.fmd @@ -21,6 +21,7 @@ } 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 451d819..fa08c13 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig +++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig @@ -32,7 +32,7 @@ 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/x1_carbon_gen1/vboot-rwab.fmd b/src/mainboard/lenovo/x1_carbon_gen1/vboot-rwab.fmd index 1747c0e..13df4f6 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 @@ } RW_VPD(PRESERVE) 0x1000 SMMSTORE(PRESERVE)@0x521000 0x40000 + RW_NVRAM(PRESERVE)@0x561000 0x2000
WP_RO { FMAP 0x800 diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index d51deae..81d3a81d 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -32,7 +32,7 @@ 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 diff --git a/src/mainboard/lenovo/x220/vboot-rwa.fmd b/src/mainboard/lenovo/x220/vboot-rwa.fmd index 8a4cd3b..4bd4b86 100644 --- a/src/mainboard/lenovo/x220/vboot-rwa.fmd +++ b/src/mainboard/lenovo/x220/vboot-rwa.fmd @@ -16,14 +16,15 @@ } 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 f966726..6f0a0b8 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -30,7 +30,7 @@ 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 diff --git a/src/mainboard/lenovo/x230/vboot-rwab.fmd b/src/mainboard/lenovo/x230/vboot-rwab.fmd index 1747c0e..13df4f6 100644 --- a/src/mainboard/lenovo/x230/vboot-rwab.fmd +++ b/src/mainboard/lenovo/x230/vboot-rwab.fmd @@ -21,6 +21,7 @@ } RW_VPD(PRESERVE) 0x1000 SMMSTORE(PRESERVE)@0x521000 0x40000 + RW_NVRAM(PRESERVE)@0x561000 0x2000
WP_RO { FMAP 0x800 diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index 8d8f625..782a266 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -26,7 +26,7 @@ select HAVE_SPD_IN_CBFS
config VBOOT - select VBOOT_VBNV_CMOS + select VBOOT_VBNV_FLASH
config MAINBOARD_DIR default "samsung/lumpy" diff --git a/src/mainboard/samsung/lumpy/chromeos.fmd b/src/mainboard/samsung/lumpy/chromeos.fmd index 9852a22..051cfd1 100644 --- a/src/mainboard/samsung/lumpy/chromeos.fmd +++ b/src/mainboard/samsung/lumpy/chromeos.fmd @@ -5,7 +5,8 @@ } SI_BIOS@0x180000 0x680000 { RW_VPD(PRESERVE)@0x0 0x1000 - RW_UNUSED@0x1000 0x67000 + RW_UNUSED@0x1000 0x5f000 + RW_NVRAM(PRESERVE)@0x60000 0x8000 RW_SHARED@0x68000 0x18000 { RW_ENVIRONMENT@0x0 0x4000 RW_MRC_CACHE@0x4000 0x10000 diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig index e123058..f79d42c 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -22,7 +22,7 @@ select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
config VBOOT - select VBOOT_VBNV_CMOS + select VBOOT_VBNV_FLASH
config MAINBOARD_DIR default "samsung/stumpy" diff --git a/src/mainboard/samsung/stumpy/chromeos.fmd b/src/mainboard/samsung/stumpy/chromeos.fmd index 9852a22..051cfd1 100644 --- a/src/mainboard/samsung/stumpy/chromeos.fmd +++ b/src/mainboard/samsung/stumpy/chromeos.fmd @@ -5,7 +5,8 @@ } SI_BIOS@0x180000 0x680000 { RW_VPD(PRESERVE)@0x0 0x1000 - RW_UNUSED@0x1000 0x67000 + RW_UNUSED@0x1000 0x5f000 + RW_NVRAM(PRESERVE)@0x60000 0x8000 RW_SHARED@0x68000 0x18000 { RW_ENVIRONMENT@0x0 0x4000 RW_MRC_CACHE@0x4000 0x10000