vboot: Separate vboot from chromeos
VBOOT_VERIFY_FIRMWARE should be independent of CHROMEOS. This allows use
of verified boot library without having to stick to CHROMEOS.
BUG=chrome-os-partner:55639
Change-Id: Ia2c328712caedd230ab295b8a613e3c1ed1532d9
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/15867
Tested-by: build bot (Jenkins)
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index e897d11..f1b1719 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -15,10 +15,10 @@
select INTEL_INT15
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
- select LID_SWITCH
select CHROMEOS_RAMOOPS_DYNAMIC
select EC_SOFTWARE_SYNC
+ select LID_SWITCH
+ select VBOOT_VBNV_CMOS
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/auron_paine/Kconfig b/src/mainboard/google/auron_paine/Kconfig
index 0b945ee..533c3da 100644
--- a/src/mainboard/google/auron_paine/Kconfig
+++ b/src/mainboard/google/auron_paine/Kconfig
@@ -15,10 +15,10 @@
select INTEL_INT15
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
- select LID_SWITCH
- select CHROMEOS_RAMOOPS_DYNAMIC
select EC_SOFTWARE_SYNC
+ select CHROMEOS_RAMOOPS_DYNAMIC
+ select LID_SWITCH
+ select VBOOT_VBNV_CMOS
select VIRTUAL_DEV_SWITCH
config VBOOT_RAMSTAGE_INDEX
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index 4240076..09d2157 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -18,7 +18,7 @@
select SERIRQ_CONTINUOUS_MODE # Workaround for EC/KBC IRQ1.
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
+ select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig
index 7588125..19d5955 100644
--- a/src/mainboard/google/cosmos/Kconfig
+++ b/src/mainboard/google/cosmos/Kconfig
@@ -27,7 +27,7 @@
select SPI_FLASH_SPANSION
config CHROMEOS
- select CHROMEOS_VBNV_FLASH
+ select VBOOT_VBNV_FLASH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index a863c55..782a460 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -16,10 +16,10 @@
select PCIEXP_L1_SUB_STATE
config CHROMEOS
- select LID_SWITCH
- select CHROMEOS_VBNV_CMOS
select EC_SOFTWARE_SYNC
+ select LID_SWITCH
select VBOOT_DYNAMIC_WORK_BUFFER
+ select VBOOT_VBNV_CMOS
select VIRTUAL_DEV_SWITCH
config DISPLAY_SPD_DATA
diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig
index d02a852..9f6a615 100644
--- a/src/mainboard/google/daisy/Kconfig
+++ b/src/mainboard/google/daisy/Kconfig
@@ -28,7 +28,7 @@
select MAINBOARD_DO_NATIVE_VGA_INIT
config CHROMEOS
- select CHROMEOS_VBNV_EC
+ select VBOOT_VBNV_EC
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig
index 5afecaa..d0b911a 100644
--- a/src/mainboard/google/falco/Kconfig
+++ b/src/mainboard/google/falco/Kconfig
@@ -21,9 +21,9 @@
select INTEL_INT15
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
- select LID_SWITCH
select EC_SOFTWARE_SYNC
+ select LID_SWITCH
+ select VBOOT_VBNV_CMOS
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig
index fa7353d..dfe79a5 100644
--- a/src/mainboard/google/foster/Kconfig
+++ b/src/mainboard/google/foster/Kconfig
@@ -27,7 +27,7 @@
select SPI_FLASH_WINBOND
config CHROMEOS
- select CHROMEOS_VBNV_FLASH
+ select VBOOT_VBNV_FLASH
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig
index 0b061af..1b657d9 100644
--- a/src/mainboard/google/gru/Kconfig
+++ b/src/mainboard/google/gru/Kconfig
@@ -39,9 +39,9 @@
select SPI_FLASH_WINBOND
config CHROMEOS
- select CHROMEOS_VBNV_FLASH
select EC_SOFTWARE_SYNC
select SPI_TPM
+ select VBOOT_VBNV_FLASH
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/guado/Kconfig b/src/mainboard/google/guado/Kconfig
index 4ca573e..09a75b7 100644
--- a/src/mainboard/google/guado/Kconfig
+++ b/src/mainboard/google/guado/Kconfig
@@ -14,10 +14,10 @@
select MAINBOARD_HAS_LPC_TPM
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
select CHROMEOS_RAMOOPS_DYNAMIC
- select VIRTUAL_DEV_SWITCH
select PHYSICAL_REC_SWITCH
+ select VBOOT_VBNV_CMOS
+ select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig
index 471e8fd..0c3d3db7 100644
--- a/src/mainboard/google/jecht/Kconfig
+++ b/src/mainboard/google/jecht/Kconfig
@@ -15,9 +15,9 @@
select INTEL_INT15
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
- select PHYSICAL_REC_SWITCH
select CHROMEOS_RAMOOPS_DYNAMIC
+ select PHYSICAL_REC_SWITCH
+ select VBOOT_VBNV_CMOS
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index 8fe3a87..d1e1140 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -17,8 +17,8 @@
select MAINBOARD_HAS_NATIVE_VGA_INIT
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
select LID_SWITCH
+ select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/ninja/Kconfig b/src/mainboard/google/ninja/Kconfig
index 232b75d..ce32d3d 100644
--- a/src/mainboard/google/ninja/Kconfig
+++ b/src/mainboard/google/ninja/Kconfig
@@ -15,6 +15,8 @@
config CHROMEOS
select EC_SOFTWARE_SYNC
+ select LID_SWITCH
+ select VBOOT_VBNV_CMOS
select VIRTUAL_DEV_SWITCH
select PHYSICAL_REC_SWITCH
diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig
index 21f42da..2c39a1a 100644
--- a/src/mainboard/google/nyan/Kconfig
+++ b/src/mainboard/google/nyan/Kconfig
@@ -32,8 +32,8 @@
select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B
config CHROMEOS
- select CHROMEOS_VBNV_EC
select EC_SOFTWARE_SYNC
+ select VBOOT_VBNV_EC
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c
index 2388f95..4ec0164 100644
--- a/src/mainboard/google/nyan/romstage.c
+++ b/src/mainboard/google/nyan/romstage.c
@@ -83,7 +83,7 @@
cbmem_initialize_empty();
/* This was already called from verstage in vboot context. */
- if (!IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE))
+ if (!IS_ENABLED(CONFIG_VBOOT))
early_mainboard_init();
run_ramstage();
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
index 7af9657..c9b8aed 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/Kconfig
@@ -34,7 +34,7 @@
config CHROMEOS
select EC_SOFTWARE_SYNC
- select CHROMEOS_VBNV_EC
+ select VBOOT_VBNV_EC
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/nyan_big/romstage.c b/src/mainboard/google/nyan_big/romstage.c
index 2388f95..4ec0164 100644
--- a/src/mainboard/google/nyan_big/romstage.c
+++ b/src/mainboard/google/nyan_big/romstage.c
@@ -83,7 +83,7 @@
cbmem_initialize_empty();
/* This was already called from verstage in vboot context. */
- if (!IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE))
+ if (!IS_ENABLED(CONFIG_VBOOT))
early_mainboard_init();
run_ramstage();
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
index 9fa99d8..3541da1 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -35,7 +35,7 @@
config CHROMEOS
select EC_SOFTWARE_SYNC
- select CHROMEOS_VBNV_EC
+ select VBOOT_VBNV_EC
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c
index e91fa33..e3d7116 100644
--- a/src/mainboard/google/nyan_blaze/romstage.c
+++ b/src/mainboard/google/nyan_blaze/romstage.c
@@ -53,7 +53,7 @@
u32 dram_end_mb = sdram_max_addressable_mb();
u32 dram_size_mb = dram_end_mb - dram_start_mb;
-#if !CONFIG_VBOOT_VERIFY_FIRMWARE
+#if !CONFIG_VBOOT
configure_l2_cache();
mmu_init();
/* Device memory below DRAM is uncached. */
@@ -87,7 +87,7 @@
cbmem_initialize_empty();
/* This was already called from verstage in vboot context. */
- if (!IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE))
+ if (!IS_ENABLED(CONFIG_VBOOT))
early_mainboard_init();
run_ramstage();
@@ -96,7 +96,7 @@
/* Stub to force arm_init_caches to the top, before any stack/memory accesses */
void main(void)
{
-#if !CONFIG_VBOOT_VERIFY_FIRMWARE
+#if !CONFIG_VBOOT
asm volatile ("bl arm_init_caches"
::: "r0","r1","r2","r3","r4","r5","ip");
#endif
diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig
index 5ab6f2d..975cdab 100644
--- a/src/mainboard/google/oak/Kconfig
+++ b/src/mainboard/google/oak/Kconfig
@@ -34,10 +34,10 @@
select SPI_FLASH
config CHROMEOS
- select CHROMEOS_VBNV_FLASH
select EC_SOFTWARE_SYNC
select VBOOT_EC_SLOW_UPDATE
select VBOOT_OPROM_MATTERS
+ select VBOOT_VBNV_FLASH
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/panther/Kconfig b/src/mainboard/google/panther/Kconfig
index b70b6cb..0aa8927 100644
--- a/src/mainboard/google/panther/Kconfig
+++ b/src/mainboard/google/panther/Kconfig
@@ -19,7 +19,7 @@
config CHROMEOS
select PHYSICAL_REC_SWITCH
- select CHROMEOS_VBNV_CMOS
+ select VBOOT_VBNV_CMOS
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index fa94ab6..974c58f 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -16,7 +16,7 @@
select INTEL_INT15
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
+ select VBOOT_VBNV_CMOS
# Workaround for EC/KBC IRQ1.
select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig
index 69ac1ae..125333c 100644
--- a/src/mainboard/google/peach_pit/Kconfig
+++ b/src/mainboard/google/peach_pit/Kconfig
@@ -26,7 +26,7 @@
select DRIVER_PARADE_PS8625
config CHROMEOS
- select CHROMEOS_VBNV_EC
+ select VBOOT_VBNV_EC
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig
index 47e715e..8829371 100644
--- a/src/mainboard/google/peppy/Kconfig
+++ b/src/mainboard/google/peppy/Kconfig
@@ -22,10 +22,10 @@
select INTEL_INT15
config CHROMEOS
- select MAINBOARD_DO_NATIVE_VGA_INIT
- select CHROMEOS_VBNV_CMOS
- select LID_SWITCH
select EC_SOFTWARE_SYNC
+ select LID_SWITCH
+ select MAINBOARD_DO_NATIVE_VGA_INIT
+ select VBOOT_VBNV_CMOS
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/purin/Kconfig b/src/mainboard/google/purin/Kconfig
index aca20e3..d415211 100644
--- a/src/mainboard/google/purin/Kconfig
+++ b/src/mainboard/google/purin/Kconfig
@@ -29,7 +29,7 @@
select SPI_ATOMIC_SEQUENCING
config CHROMEOS
- select CHROMEOS_VBNV_FLASH
+ select VBOOT_VBNV_FLASH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 3539f0e..48af3b3 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -13,9 +13,9 @@
select MAINBOARD_HAS_LPC_TPM
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
- select LID_SWITCH
select EC_SOFTWARE_SYNC
+ select LID_SWITCH
+ select VBOOT_VBNV_CMOS
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/rikku/Kconfig b/src/mainboard/google/rikku/Kconfig
index 83a99bd..a421e77 100644
--- a/src/mainboard/google/rikku/Kconfig
+++ b/src/mainboard/google/rikku/Kconfig
@@ -14,10 +14,10 @@
select MAINBOARD_HAS_LPC_TPM
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
select CHROMEOS_RAMOOPS_DYNAMIC
- select VIRTUAL_DEV_SWITCH
select PHYSICAL_REC_SWITCH
+ select VBOOT_VBNV_CMOS
+ select VIRTUAL_DEV_SWITCH
config VBOOT_RAMSTAGE_INDEX
hex
diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig
index cb00ba7..09d9ebf 100644
--- a/src/mainboard/google/rush/Kconfig
+++ b/src/mainboard/google/rush/Kconfig
@@ -29,8 +29,8 @@
select BOARD_ROMSIZE_KB_4096
config CHROMEOS
- select CHROMEOS_VBNV_EC
select EC_SOFTWARE_SYNC
+ select VBOOT_VBNV_EC
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig
index efcb2d9..7b559a9 100644
--- a/src/mainboard/google/rush_ryu/Kconfig
+++ b/src/mainboard/google/rush_ryu/Kconfig
@@ -30,8 +30,8 @@
select BOARD_ROMSIZE_KB_8192
config CHROMEOS
- select CHROMEOS_VBNV_EC
select EC_SOFTWARE_SYNC
+ select VBOOT_VBNV_EC
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/rush_ryu/mainboard.c b/src/mainboard/google/rush_ryu/mainboard.c
index 85034b3..b53b0ff 100644
--- a/src/mainboard/google/rush_ryu/mainboard.c
+++ b/src/mainboard/google/rush_ryu/mainboard.c
@@ -35,8 +35,8 @@
#include <vendorcode/google/chromeos/cros_vpd.h>
#if IS_ENABLED(CONFIG_CHROMEOS)
#include <vboot_struct.h>
-#include <vendorcode/google/chromeos/vboot2/misc.h>
-#include <vendorcode/google/chromeos/vboot_common.h>
+#include <vboot/misc.h>
+#include <vboot/vboot_common.h>
#endif
#include "gpio.h"
diff --git a/src/mainboard/google/samus/Kconfig b/src/mainboard/google/samus/Kconfig
index 329fa1f..0275189 100644
--- a/src/mainboard/google/samus/Kconfig
+++ b/src/mainboard/google/samus/Kconfig
@@ -16,12 +16,12 @@
select INTEL_INT15
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
- select LID_SWITCH
+ select CHROMEOS_RAMOOPS_DYNAMIC
select EC_SOFTWARE_SYNC
+ select LID_SWITCH
select VBOOT_EC_SLOW_UPDATE
select VBOOT_OPROM_MATTERS
- select CHROMEOS_RAMOOPS_DYNAMIC
+ select VBOOT_VBNV_CMOS
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig
index a2d47a4..03e8bd4 100644
--- a/src/mainboard/google/smaug/Kconfig
+++ b/src/mainboard/google/smaug/Kconfig
@@ -33,8 +33,8 @@
select RAM_CODE_SUPPORT
config CHROMEOS
- select CHROMEOS_VBNV_FLASH
select EC_SOFTWARE_SYNC
+ select VBOOT_VBNV_FLASH
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index 3a2250d..571cbce 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -18,7 +18,7 @@
select SANDYBRIDGE_IVYBRIDGE_LVDS
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
+ select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/tidus/Kconfig b/src/mainboard/google/tidus/Kconfig
index 196bd76..fd841a9 100644
--- a/src/mainboard/google/tidus/Kconfig
+++ b/src/mainboard/google/tidus/Kconfig
@@ -14,10 +14,10 @@
select MAINBOARD_HAS_LPC_TPM
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
select CHROMEOS_RAMOOPS_DYNAMIC
- select VIRTUAL_DEV_SWITCH
select PHYSICAL_REC_SWITCH
+ select VBOOT_VBNV_CMOS
+ select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig
index 27b3fee..c21cd3f 100644
--- a/src/mainboard/google/veyron/Kconfig
+++ b/src/mainboard/google/veyron/Kconfig
@@ -36,8 +36,8 @@
select SPI_FLASH_WINBOND
config CHROMEOS
- select CHROMEOS_VBNV_EC
select EC_SOFTWARE_SYNC
+ select VBOOT_VBNV_EC
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig
index e16d9d5..41a7456 100644
--- a/src/mainboard/google/veyron_brain/Kconfig
+++ b/src/mainboard/google/veyron_brain/Kconfig
@@ -31,8 +31,8 @@
select SPI_FLASH_WINBOND
config CHROMEOS
- select CHROMEOS_VBNV_FLASH
select PHYSICAL_REC_SWITCH
+ select VBOOT_VBNV_FLASH
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/veyron_danger/Kconfig b/src/mainboard/google/veyron_danger/Kconfig
index 2544205..cb1dc71 100644
--- a/src/mainboard/google/veyron_danger/Kconfig
+++ b/src/mainboard/google/veyron_danger/Kconfig
@@ -33,8 +33,8 @@
select MAINBOARD_HAS_CHROMEOS
config CHROMEOS
- select CHROMEOS_VBNV_FLASH
select PHYSICAL_REC_SWITCH
+ select VBOOT_VBNV_FLASH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/veyron_emile/Kconfig b/src/mainboard/google/veyron_emile/Kconfig
index 895953c..059dd1f 100644
--- a/src/mainboard/google/veyron_emile/Kconfig
+++ b/src/mainboard/google/veyron_emile/Kconfig
@@ -31,8 +31,8 @@
select MAINBOARD_HAS_NATIVE_VGA_INIT
config CHROMEOS
- select CHROMEOS_VBNV_FLASH
select PHYSICAL_REC_SWITCH
+ select VBOOT_VBNV_FLASH
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig
index 3bf59f2..6f489ff 100644
--- a/src/mainboard/google/veyron_mickey/Kconfig
+++ b/src/mainboard/google/veyron_mickey/Kconfig
@@ -31,8 +31,8 @@
select SPI_FLASH_WINBOND
config CHROMEOS
- select CHROMEOS_VBNV_FLASH
select PHYSICAL_REC_SWITCH
+ select VBOOT_VBNV_FLASH
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig
index 7b15310..9321812 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -31,8 +31,8 @@
select SPI_FLASH_WINBOND
config CHROMEOS
- select CHROMEOS_VBNV_FLASH
select PHYSICAL_REC_SWITCH
+ select VBOOT_VBNV_FLASH
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/veyron_romy/Kconfig b/src/mainboard/google/veyron_romy/Kconfig
index ec15026..c151727 100644
--- a/src/mainboard/google/veyron_romy/Kconfig
+++ b/src/mainboard/google/veyron_romy/Kconfig
@@ -31,8 +31,8 @@
select SPI_FLASH_WINBOND
config CHROMEOS
- select CHROMEOS_VBNV_FLASH
select PHYSICAL_REC_SWITCH
+ select VBOOT_VBNV_FLASH
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig
index 47aca1a..df5d312 100644
--- a/src/mainboard/intel/baskingridge/Kconfig
+++ b/src/mainboard/intel/baskingridge/Kconfig
@@ -15,7 +15,7 @@
select INTEL_INT15
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
+ select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
string
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index dd9a7c7..9ee41e8 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -14,7 +14,7 @@
#select MAINBOARD_HAS_CHROMEOS
config CHROMEOS
- #select CHROMEOS_VBNV_CMOS
+ #select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
string
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig
index 3faa1bf..42118f9 100644
--- a/src/mainboard/intel/strago/Kconfig
+++ b/src/mainboard/intel/strago/Kconfig
@@ -16,10 +16,10 @@
select PCIEXP_L1_SUB_STATE
config CHROMEOS
- select LID_SWITCH
- select CHROMEOS_VBNV_CMOS
select EC_SOFTWARE_SYNC
+ select LID_SWITCH
select VBOOT_DYNAMIC_WORK_BUFFER
+ select VBOOT_VBNV_CMOS
select VIRTUAL_DEV_SWITCH
config DYNAMIC_VNN_SUPPORT
diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig
index e739efa..f57cb23 100644
--- a/src/mainboard/intel/wtm2/Kconfig
+++ b/src/mainboard/intel/wtm2/Kconfig
@@ -15,7 +15,7 @@
config CHROMEOS
select CHROMEOS_RAMOOPS_DYNAMIC
- select CHROMEOS_VBNV_CMOS
+ select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
string
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index adeb9fb..7cb00e5 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -21,7 +21,7 @@
select INTEL_INT15
config CHROMEOS
- select CHROMEOS_VBNV_CMOS
+ select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
string
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index 699e58e..3777f69 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -19,7 +19,7 @@
config CHROMEOS
select PHYSICAL_REC_SWITCH
- select CHROMEOS_VBNV_CMOS
+ select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
string