summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cpu/intel/model_2065x/Kconfig1
-rw-r--r--src/cpu/intel/model_206ax/Kconfig1
-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
6 files changed, 6 insertions, 6 deletions
diff --git a/src/cpu/intel/model_2065x/Kconfig b/src/cpu/intel/model_2065x/Kconfig
index 5ff809fc62..bced054de9 100644
--- a/src/cpu/intel/model_2065x/Kconfig
+++ b/src/cpu/intel/model_2065x/Kconfig
@@ -7,7 +7,6 @@ config CPU_SPECIFIC_OPTIONS
def_bool y
select HAVE_EXP_X86_64_SUPPORT
select ARCH_X86
- select BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES
select SSE2
select UDELAY_TSC
select TSC_MONOTONIC_TIMER
diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig
index c168c9bd01..032450dd32 100644
--- a/src/cpu/intel/model_206ax/Kconfig
+++ b/src/cpu/intel/model_206ax/Kconfig
@@ -6,7 +6,6 @@ if CPU_INTEL_MODEL_206AX
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/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