summaryrefslogtreecommitdiff
path: root/src/mainboard/samsung
diff options
context:
space:
mode:
authorYu-Ping Wu <yupingso@chromium.org>2022-11-14 16:33:42 +0800
committerEric Lai <eric_lai@quanta.corp-partner.google.com>2023-02-08 00:54:16 +0000
commit5aed1a0d727163f6fa6dae97a8f852edb7a6fe19 (patch)
tree0c29f6acc9a5a323728e43d4c6fff8bafe0bbf90 /src/mainboard/samsung
parent1b7489839561e06d0f64bc1f9b0445725ec59c30 (diff)
mb/samsung: Enable VBOOT_VBNV_FLASH
To deprecate VBOOT_VBNV_CMOS [1], replace VBOOT_VBNV_CMOS with VBOOT_VBNV_FLASH for samsung boards lumpy and stumpy. 0x8000 unused flash space is allocated for RW_NVRAM. Previously BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES was selected for CPU_INTEL_HASWELL, CPU_INTEL_MODEL_{2065X,206AX} and others (see [2]). However, there seems to be no particular reason on those platforms. We've dropped the config for haswell. Now drop it for CPU_INTEL_MODEL_{2065X,206AX}, so that VBOOT_VBNV_FLASH can be enabled. [1] https://web.archive.org/web/20230115020833/https://issuetracker.google.com/issues/235293589?pli=1 [2] commit 6c2568f4f58b9a1b209c9af36d7f980fde784f08 ("drivers/spi: Add BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES config") BUG=b:235293589 TEST=./util/abuild/abuild -a -t SAMSUNG_LUMPY -x Change-Id: I833edd4f7a328b21e81c971ba8a9aec0aad7d3d3 Signed-off-by: Yu-Ping Wu <yupingso@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/70296 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Yidi Lin <yidilin@google.com>
Diffstat (limited to 'src/mainboard/samsung')
-rw-r--r--src/mainboard/samsung/lumpy/Kconfig2
-rw-r--r--src/mainboard/samsung/lumpy/chromeos.fmd3
-rw-r--r--src/mainboard/samsung/stumpy/Kconfig2
-rw-r--r--src/mainboard/samsung/stumpy/chromeos.fmd3
4 files changed, 6 insertions, 4 deletions
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 8d8f625a38..782a2662b1 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS
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 9852a2209c..051cfd1a2e 100644
--- a/src/mainboard/samsung/lumpy/chromeos.fmd
+++ b/src/mainboard/samsung/lumpy/chromeos.fmd
@@ -5,7 +5,8 @@ FLASH@0xff800000 0x800000 {
}
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 e123058a6d..f79d42ca2d 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
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 9852a2209c..051cfd1a2e 100644
--- a/src/mainboard/samsung/stumpy/chromeos.fmd
+++ b/src/mainboard/samsung/stumpy/chromeos.fmd
@@ -5,7 +5,8 @@ FLASH@0xff800000 0x800000 {
}
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