summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/auron/Kconfig4
-rw-r--r--src/mainboard/google/beltino/Kconfig4
-rw-r--r--src/mainboard/google/butterfly/Kconfig2
-rw-r--r--src/mainboard/google/chell/Kconfig4
-rw-r--r--src/mainboard/google/cosmos/Kconfig2
-rw-r--r--src/mainboard/google/cyan/Kconfig4
-rw-r--r--src/mainboard/google/daisy/Kconfig2
-rw-r--r--src/mainboard/google/eve/Kconfig4
-rw-r--r--src/mainboard/google/fizz/Kconfig2
-rw-r--r--src/mainboard/google/foster/Kconfig4
-rw-r--r--src/mainboard/google/gale/Kconfig4
-rw-r--r--src/mainboard/google/glados/Kconfig4
-rw-r--r--src/mainboard/google/gru/Kconfig2
-rw-r--r--src/mainboard/google/jecht/Kconfig4
-rw-r--r--src/mainboard/google/lars/Kconfig4
-rw-r--r--src/mainboard/google/link/Kconfig4
-rw-r--r--src/mainboard/google/nyan/Kconfig2
-rw-r--r--src/mainboard/google/nyan_big/Kconfig2
-rw-r--r--src/mainboard/google/nyan_blaze/Kconfig2
-rw-r--r--src/mainboard/google/oak/Kconfig3
-rw-r--r--src/mainboard/google/parrot/Kconfig2
-rw-r--r--src/mainboard/google/peach_pit/Kconfig2
-rw-r--r--src/mainboard/google/poppy/Kconfig4
-rw-r--r--src/mainboard/google/purin/Kconfig2
-rw-r--r--src/mainboard/google/rambi/Kconfig4
-rw-r--r--src/mainboard/google/reef/Kconfig4
-rw-r--r--src/mainboard/google/rotor/Kconfig4
-rw-r--r--src/mainboard/google/slippy/Kconfig4
-rw-r--r--src/mainboard/google/smaug/Kconfig2
-rw-r--r--src/mainboard/google/storm/Kconfig4
-rw-r--r--src/mainboard/google/stout/Kconfig2
-rw-r--r--src/mainboard/google/veyron/Kconfig15
-rw-r--r--src/mainboard/google/veyron_mickey/Kconfig10
-rw-r--r--src/mainboard/google/veyron_rialto/Kconfig4
34 files changed, 61 insertions, 65 deletions
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index 41c9a7cf1b..d911ff5461 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -16,8 +16,10 @@ if BOARD_GOOGLE_BASEBOARD_AURON
config CHROMEOS
select CHROMEOS_RAMOOPS_DYNAMIC
+
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
- select LID_SWITCH
+ select VBOOT_LID_SWITCH
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig
index bceb8fb74b..a029fecab2 100644
--- a/src/mainboard/google/beltino/Kconfig
+++ b/src/mainboard/google/beltino/Kconfig
@@ -15,8 +15,8 @@ config BOARD_GOOGLE_BASEBOARD_BELTINO
if BOARD_GOOGLE_BASEBOARD_BELTINO
-config CHROMEOS
- select PHYSICAL_REC_SWITCH
+config VBOOT
+ select VBOOT_PHYSICAL_REC_SWITCH
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index 09d2157d3a..ffd0c03cd1 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -17,7 +17,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select INTEL_INT15
select SERIRQ_CONTINUOUS_MODE # Workaround for EC/KBC IRQ1.
-config CHROMEOS
+config VBOOT
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/google/chell/Kconfig b/src/mainboard/google/chell/Kconfig
index 9b88a8573d..01423a7571 100644
--- a/src/mainboard/google/chell/Kconfig
+++ b/src/mainboard/google/chell/Kconfig
@@ -20,9 +20,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MONOTONIC_TIMER_MSR
select SOC_INTEL_SKYLAKE
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
- select LID_SWITCH
+ select VBOOT_LID_SWITCH
config IRQ_SLOT_COUNT
int
diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig
index 62cd821009..3d8d64921c 100644
--- a/src/mainboard/google/cosmos/Kconfig
+++ b/src/mainboard/google/cosmos/Kconfig
@@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SPI_FLASH
select SPI_FLASH_SPANSION
-config CHROMEOS
+config VBOOT
select VBOOT_VBNV_FLASH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index 424c08fa34..77d72ae55f 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -15,9 +15,9 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_RESUME
select PCIEXP_L1_SUB_STATE
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
- select LID_SWITCH
+ select VBOOT_LID_SWITCH
select VBOOT_VBNV_CMOS
config DISPLAY_SPD_DATA
diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig
index 29d6690c72..b08500de24 100644
--- a/src/mainboard/google/daisy/Kconfig
+++ b/src/mainboard/google/daisy/Kconfig
@@ -28,7 +28,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_DO_NATIVE_VGA_INIT
-config CHROMEOS
+config VBOOT
select VBOOT_VBNV_EC
config MAINBOARD_DIR
diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig
index b4442f2f20..1d1fa7b133 100644
--- a/src/mainboard/google/eve/Kconfig
+++ b/src/mainboard/google/eve/Kconfig
@@ -21,10 +21,10 @@ config BOARD_SPECIFIC_OPTIONS
select SOC_INTEL_KABYLAKE
select TPM2
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
select HAS_RECOVERY_MRC_CACHE
- select LID_SWITCH
+ select VBOOT_LID_SWITCH
select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
config DRIVER_TPM_I2C_BUS
diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index a3be595fa7..377a13c773 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -14,7 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
select NO_FADT_8042
select SOC_INTEL_KABYLAKE
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig
index c408ca1f9d..ee22110bf3 100644
--- a/src/mainboard/google/foster/Kconfig
+++ b/src/mainboard/google/foster/Kconfig
@@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select COMMON_CBFS_SPI_WRAPPER
select SPI_FLASH_WINBOND
-config CHROMEOS
+config VBOOT
select VBOOT_VBNV_FLASH
config MAINBOARD_DIR
@@ -84,7 +84,7 @@ config GBB_HWID
depends on CHROMEOS
default "FOSTER TEST 1184"
-config CHROMEOS_FWID_MODEL
+config VBOOT_FWID_MODEL
string
default "Nvidia_Foster"
diff --git a/src/mainboard/google/gale/Kconfig b/src/mainboard/google/gale/Kconfig
index b6639bc5d5..461ed5b76e 100644
--- a/src/mainboard/google/gale/Kconfig
+++ b/src/mainboard/google/gale/Kconfig
@@ -31,9 +31,9 @@ config BOARD_SPECIFIC_OPTIONS
select SPI_FLASH_WINBOND
select DRIVERS_UART
-config CHROMEOS
+config VBOOT
select VBOOT_DISABLE_DEV_ON_RECOVERY
- select WIPEOUT_SUPPORTED
+ select VBOOT_WIPEOUT_SUPPORTED
config BOARD_VARIANT_DK01
bool "Build an image for DK01"
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index 09082945de..102a8c1e17 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -20,9 +20,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MONOTONIC_TIMER_MSR
select SOC_INTEL_SKYLAKE
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
- select LID_SWITCH
+ select VBOOT_LID_SWITCH
config IRQ_SLOT_COUNT
int
diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig
index bd19a291dc..43f671b600 100644
--- a/src/mainboard/google/gru/Kconfig
+++ b/src/mainboard/google/gru/Kconfig
@@ -45,7 +45,7 @@ config BOARD_SPECIFIC_OPTIONS
select SPI_FLASH_GIGADEVICE
select SPI_FLASH_WINBOND
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
select MAINBOARD_HAS_SPI_TPM_CR50 if GRU_HAS_TPM2
select SPI_TPM if GRU_HAS_TPM2
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig
index 39cee21044..fdb5ee01ff 100644
--- a/src/mainboard/google/jecht/Kconfig
+++ b/src/mainboard/google/jecht/Kconfig
@@ -14,7 +14,9 @@ if BOARD_GOOGLE_BASEBOARD_JECHT
config CHROMEOS
select CHROMEOS_RAMOOPS_DYNAMIC
- select PHYSICAL_REC_SWITCH
+
+config VBOOT
+ select VBOOT_PHYSICAL_REC_SWITCH
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/google/lars/Kconfig b/src/mainboard/google/lars/Kconfig
index 73d502c313..78db8b219c 100644
--- a/src/mainboard/google/lars/Kconfig
+++ b/src/mainboard/google/lars/Kconfig
@@ -22,9 +22,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MONOTONIC_TIMER_MSR
select SOC_INTEL_SKYLAKE
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
- select LID_SWITCH
+ select VBOOT_LID_SWITCH
config IRQ_SLOT_COUNT
int
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index b521f9c238..8469e86c1f 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -16,9 +16,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SERIRQ_CONTINUOUS_MODE
select MAINBOARD_HAS_NATIVE_VGA_INIT
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
- select LID_SWITCH
+ select VBOOT_LID_SWITCH
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig
index 7f5854ce03..d944a439b3 100644
--- a/src/mainboard/google/nyan/Kconfig
+++ b/src/mainboard/google/nyan/Kconfig
@@ -31,7 +31,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SPI_FLASH_WINBOND
select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
select VBOOT_VBNV_EC
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
index 602e778569..cacc301865 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/Kconfig
@@ -32,7 +32,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SPI_FLASH_WINBOND
select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
select VBOOT_VBNV_EC
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
index d64eb72c84..2264068f8c 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -33,7 +33,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SPI_FLASH_WINBOND
select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
select VBOOT_VBNV_EC
diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig
index 0efa478dc4..28771b8dd7 100644
--- a/src/mainboard/google/oak/Kconfig
+++ b/src/mainboard/google/oak/Kconfig
@@ -33,10 +33,9 @@ config BOARD_SPECIFIC_OPTIONS
select RAM_CODE_SUPPORT
select SPI_FLASH
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
select VBOOT_EC_SLOW_UPDATE
- select VBOOT_OPROM_MATTERS
select VBOOT_VBNV_FLASH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index 7b6b49b98a..5ce1f2492e 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -17,7 +17,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
# Workaround for EC/KBC IRQ1.
select SERIRQ_CONTINUOUS_MODE
-config CHROMEOS
+config VBOOT
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig
index be06a18d0a..640c0099cf 100644
--- a/src/mainboard/google/peach_pit/Kconfig
+++ b/src/mainboard/google/peach_pit/Kconfig
@@ -25,7 +25,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_DO_NATIVE_VGA_INIT
select DRIVER_PARADE_PS8625
-config CHROMEOS
+config VBOOT
select VBOOT_VBNV_EC
config MAINBOARD_DIR
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 2240c2d89c..fc68edfe1a 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -16,9 +16,9 @@ config BOARD_SPECIFIC_OPTIONS
select NO_FADT_8042
select SOC_INTEL_KABYLAKE
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
- select LID_SWITCH
+ select VBOOT_LID_SWITCH
config GBB_HWID
string
diff --git a/src/mainboard/google/purin/Kconfig b/src/mainboard/google/purin/Kconfig
index ca0909b25e..6e0572420c 100644
--- a/src/mainboard/google/purin/Kconfig
+++ b/src/mainboard/google/purin/Kconfig
@@ -27,7 +27,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SPI_FLASH_SPANSION
select SPI_FLASH_STMICRO # required for the reference board BCM958305K
-config CHROMEOS
+config VBOOT
select VBOOT_VBNV_FLASH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 9b25b49b45..78f077ab7b 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -13,9 +13,9 @@ config BOARD_GOOGLE_BASEBOARD_RAMBI
if BOARD_GOOGLE_BASEBOARD_RAMBI
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
- select LID_SWITCH
+ select VBOOT_LID_SWITCH
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index b6c3462f2d..c4bf212d02 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -37,11 +37,11 @@ config DRIVER_TPM_I2C_IRQ
int
default 60 # GPE0_DW1_28
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
select HAS_RECOVERY_MRC_CACHE
select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
- select LID_SWITCH if BASEBOARD_REEF_LAPTOP
+ select VBOOT_LID_SWITCH if BASEBOARD_REEF_LAPTOP
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/rotor/Kconfig b/src/mainboard/google/rotor/Kconfig
index a47a766601..437fa02c18 100644
--- a/src/mainboard/google/rotor/Kconfig
+++ b/src/mainboard/google/rotor/Kconfig
@@ -21,7 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_HAS_CHROMEOS
select BOARD_ROMSIZE_KB_4096
-config CHROMEOS
+config VBOOT
select VBOOT_MOCK_SECDATA
config MAINBOARD_DIR
@@ -37,7 +37,7 @@ config GBB_HWID
depends on CHROMEOS
default "ROTOR TEST 1234"
-config CHROMEOS_FWID_MODEL
+config VBOOT_FWID_MODEL
string
default "Marvell_Rotor"
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index a19c966e6e..1537ff11ca 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -21,9 +21,9 @@ config BOARD_GOOGLE_BASEBOARD_SLIPPY
if BOARD_GOOGLE_BASEBOARD_SLIPPY
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
- select LID_SWITCH
+ select VBOOT_LID_SWITCH
select MAINBOARD_DO_NATIVE_VGA_INIT if (BOARD_GOOGLE_FALCO || BOARD_GOOGLE_PEPPY)
select VBOOT_VBNV_CMOS
diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig
index 52076748a5..344be282dc 100644
--- a/src/mainboard/google/smaug/Kconfig
+++ b/src/mainboard/google/smaug/Kconfig
@@ -32,7 +32,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_HAS_CHROMEOS
select RAM_CODE_SUPPORT
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
select VBOOT_VBNV_FLASH
diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig
index f844cf8b04..24822ab8dd 100644
--- a/src/mainboard/google/storm/Kconfig
+++ b/src/mainboard/google/storm/Kconfig
@@ -29,9 +29,9 @@ config BOARD_SPECIFIC_OPTIONS
select SPI_FLASH_STMICRO
select DRIVERS_UART
-config CHROMEOS
+config VBOOT
select VBOOT_DISABLE_DEV_ON_RECOVERY
- select WIPEOUT_SUPPORTED
+ select VBOOT_WIPEOUT_SUPPORTED
config BOARD_VARIANT_AP148
bool "pick this to build an image for ap148"
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index 571cbce394..d34f595c9f 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -17,7 +17,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select INTEL_INT15
select SANDYBRIDGE_IVYBRIDGE_LVDS
-config CHROMEOS
+config VBOOT
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig
index 3eb32525a1..5fb340bcfc 100644
--- a/src/mainboard/google/veyron/Kconfig
+++ b/src/mainboard/google/veyron/Kconfig
@@ -45,7 +45,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SPI_FLASH_GIGADEVICE
select SPI_FLASH_WINBOND
-config CHROMEOS
+config VBOOT
select VBOOT_VBNV_EC
config MAINBOARD_DIR
@@ -54,6 +54,11 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER
string
+ default "Veyron_Jaq" if BOARD_GOOGLE_VEYRON_JAQ
+ default "Veyron_Jerry" if BOARD_GOOGLE_VEYRON_JERRY
+ default "Veyron_Mighty" if BOARD_GOOGLE_VEYRON_MIGHTY
+ default "Veyron_Minnie" if BOARD_GOOGLE_VEYRON_MINNIE
+ default "Veyron_Speedy" if BOARD_GOOGLE_VEYRON_SPEEDY
default "Veyron"
config MAINBOARD_VENDOR
@@ -112,12 +117,4 @@ config GBB_HWID
default "MINNIE TEST A-A 5151" if BOARD_GOOGLE_VEYRON_MINNIE
default "SPEEDY TEST A-A 8421" if BOARD_GOOGLE_VEYRON_SPEEDY
-config CHROMEOS_FWID_MODEL
- string
- default "Google_Veyron_Jaq" if BOARD_GOOGLE_VEYRON_JAQ
- default "Google_Veyron_Jerry" if BOARD_GOOGLE_VEYRON_JERRY
- default "Google_Veyron_Mighty" if BOARD_GOOGLE_VEYRON_MIGHTY
- default "Google_Veyron_Minnie" if BOARD_GOOGLE_VEYRON_MINNIE
- default "Google_Veyron_Speedy" if BOARD_GOOGLE_VEYRON_SPEEDY
-
endif # BOARD_GOOGLE_VEYRON
diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig
index 24d7921bc9..1f66ff035e 100644
--- a/src/mainboard/google/veyron_mickey/Kconfig
+++ b/src/mainboard/google/veyron_mickey/Kconfig
@@ -30,8 +30,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SPI_FLASH_GIGADEVICE
select SPI_FLASH_WINBOND
-config CHROMEOS
- select PHYSICAL_REC_SWITCH
+config VBOOT
+ select VBOOT_PHYSICAL_REC_SWITCH
select VBOOT_VBNV_FLASH
config MAINBOARD_DIR
@@ -40,7 +40,7 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER
string
- default "Veyron_mickey"
+ default "Veyron_Mickey"
config MAINBOARD_VENDOR
string
@@ -72,8 +72,4 @@ config GBB_HWID
depends on CHROMEOS
default "MICKEY TEST A-A 0352"
-config CHROMEOS_FWID_MODEL
- string
- default "Google_Veyron_Mickey"
-
endif # BOARD_GOOGLE_VEYRON_MICKEY
diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig
index bbd6ffddfb..cc6a4a6058 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -30,8 +30,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SPI_FLASH_GIGADEVICE
select SPI_FLASH_WINBOND
-config CHROMEOS
- select PHYSICAL_REC_SWITCH
+config VBOOT
+ select VBOOT_PHYSICAL_REC_SWITCH
select VBOOT_VBNV_FLASH
config MAINBOARD_DIR