ChromeOS mainboards: Move more Kconfig symbols under CHROMEOS

Move the CHROMEOS dependent symbols VIRTUAL_DEV_SWITCH and
VBOOT_DYNAMIC_WORK_BUFFER under the CHROMEOS config options for the
mainboards that use them.

Change-Id: Iad126cf045cb3a312319037aff3c4b1f15f6529d
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: http://review.coreboot.org/11336
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins)

src/mainboard/google/auron/Kconfig

@@ -5,7 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOC_INTEL_BROADWELL
 	select BOARD_ROMSIZE_KB_8192
 	select EC_GOOGLE_CHROMEEC
-	select VIRTUAL_DEV_SWITCH
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
@@ -20,6 +19,7 @@ config CHROMEOS
 	select LID_SWITCH
 	select CHROMEOS_RAMOOPS_DYNAMIC
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config VBOOT_RAMSTAGE_INDEX
 	hex

src/mainboard/google/bolt/Kconfig

@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select INTEL_LYNXPOINT_LP
 	select BOARD_ROMSIZE_KB_8192
 	select EC_GOOGLE_CHROMEEC
-	select VIRTUAL_DEV_SWITCH
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
@@ -22,6 +21,7 @@ config CHROMEOS
 	select CHROMEOS_VBNV_CMOS
 	select LID_SWITCH
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/cyan/Kconfig

@@ -14,14 +14,14 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LPC_TPM
 	select SOC_INTEL_BRASWELL
-	select VBOOT_DYNAMIC_WORK_BUFFER
-	select VIRTUAL_DEV_SWITCH
 	select HAVE_ACPI_RESUME
 
 config CHROMEOS
 	select LID_SWITCH
 	select CHROMEOS_VBNV_CMOS
 	select EC_SOFTWARE_SYNC
+	select VBOOT_DYNAMIC_WORK_BUFFER
+	select VIRTUAL_DEV_SWITCH
 
 config DISPLAY_SPD_DATA
 	bool "Display Memory Serial Presence Detect Data"

src/mainboard/google/falco/Kconfig

@@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select INTEL_LYNXPOINT_LP
 	select BOARD_ROMSIZE_KB_8192
 	select EC_GOOGLE_CHROMEEC
-	select VIRTUAL_DEV_SWITCH
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
@@ -25,6 +24,7 @@ config CHROMEOS
 	select CHROMEOS_VBNV_CMOS
 	select LID_SWITCH
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/foster/Kconfig

@@ -26,13 +26,13 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SPI_FLASH
 	select SOC_NVIDIA_TEGRA210
 	select MAINBOARD_HAS_CHROMEOS
-	select VIRTUAL_DEV_SWITCH
 	select BOOTROM_SDRAM_INIT # use BootRom to config sdram
 	select COMMON_CBFS_SPI_WRAPPER
 	select SPI_FLASH_WINBOND
 
 config CHROMEOS
 	select CHROMEOS_VBNV_FLASH
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/glados/Kconfig

@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MMCONF_SUPPORT
 	select MONOTONIC_TIMER_MSR
 	select SOC_INTEL_SKYLAKE
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select CHROMEOS_RAMOOPS_DYNAMIC
@@ -25,6 +24,7 @@ config CHROMEOS
 	select EC_SOFTWARE_SYNC
 	select LID_SWITCH
 	select VBOOT_OPROM_MATTERS
+	select VIRTUAL_DEV_SWITCH
 
 config IRQ_SLOT_COUNT
 	int

src/mainboard/google/jecht/Kconfig

@@ -5,7 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOC_INTEL_BROADWELL
 	select BOARD_ROMSIZE_KB_8192
 	select SUPERIO_ITE_IT8772F
-	select VIRTUAL_DEV_SWITCH
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
@@ -19,6 +18,7 @@ config CHROMEOS
 	select CHROMEOS_VBNV_CMOS
 	select PHYSICAL_REC_SWITCH
 	select CHROMEOS_RAMOOPS_DYNAMIC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/nyan/Kconfig

@@ -31,11 +31,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select BOARD_ROMSIZE_KB_4096
 	select SPI_FLASH
 	select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select CHROMEOS_VBNV_EC
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/nyan_big/Kconfig

@@ -32,11 +32,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select BOARD_ROMSIZE_KB_4096
 	select SPI_FLASH
 	select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select EC_SOFTWARE_SYNC
 	select CHROMEOS_VBNV_EC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/nyan_blaze/Kconfig

@@ -33,11 +33,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select BOARD_ROMSIZE_KB_4096
 	select SPI_FLASH
 	select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select EC_SOFTWARE_SYNC
 	select CHROMEOS_VBNV_EC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/panther/Kconfig

@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select INTEL_LYNXPOINT_LP
 	select BOARD_ROMSIZE_KB_8192
 	select SUPERIO_ITE_IT8772F
-	select VIRTUAL_DEV_SWITCH
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
@@ -21,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 config CHROMEOS
 	select PHYSICAL_REC_SWITCH
 	select CHROMEOS_VBNV_CMOS
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/peppy/Kconfig

@@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select INTEL_LYNXPOINT_LP
 	select BOARD_ROMSIZE_KB_8192
 	select EC_GOOGLE_CHROMEEC
-	select VIRTUAL_DEV_SWITCH
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
@@ -27,6 +26,7 @@ config CHROMEOS
 	select CHROMEOS_VBNV_CMOS
 	select LID_SWITCH
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/rambi/Kconfig

@@ -4,7 +4,6 @@ config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SOC_INTEL_BAYTRAIL
 	select EC_GOOGLE_CHROMEEC
-	select VIRTUAL_DEV_SWITCH
 	select ENABLE_BUILTIN_COM1
 	select BOARD_ROMSIZE_KB_8192
 	select HAVE_ACPI_TABLES
@@ -19,6 +18,7 @@ config CHROMEOS
 	select CHROMEOS_VBNV_CMOS
 	select LID_SWITCH
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/rush/Kconfig

@@ -30,13 +30,13 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOC_NVIDIA_TEGRA132
 	select MAINBOARD_DO_SOR_INIT
 	select MAINBOARD_HAS_CHROMEOS
-	select VIRTUAL_DEV_SWITCH
 	select BOARD_ROMSIZE_KB_4096
 	select ARM64_USE_SPINTABLE
 
 config CHROMEOS
 	select CHROMEOS_VBNV_EC
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/rush_ryu/Kconfig

@@ -32,12 +32,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MAINBOARD_DO_DSI_INIT
 	select MAINBOARD_HAS_CHROMEOS
 	select BOARD_ROMSIZE_KB_8192
-	select VIRTUAL_DEV_SWITCH
 	select ARM64_USE_SPINTABLE
 
 config CHROMEOS
 	select CHROMEOS_VBNV_EC
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/samus/Kconfig

@@ -5,7 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOC_INTEL_BROADWELL
 	select BOARD_ROMSIZE_KB_8192
 	select EC_GOOGLE_CHROMEEC
-	select VIRTUAL_DEV_SWITCH
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
@@ -22,6 +21,7 @@ config CHROMEOS
 	select VBOOT_EC_SLOW_UPDATE
 	select VBOOT_OPROM_MATTERS
 	select CHROMEOS_RAMOOPS_DYNAMIC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/slippy/Kconfig

@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select INTEL_LYNXPOINT_LP
 	select BOARD_ROMSIZE_KB_8192
 	select EC_GOOGLE_CHROMEEC
-	select VIRTUAL_DEV_SWITCH
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
@@ -24,6 +23,7 @@ config CHROMEOS
 	select CHROMEOS_VBNV_CMOS
 	select LID_SWITCH
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/smaug/Kconfig

@@ -34,12 +34,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOC_NVIDIA_TEGRA210
 	select MAINBOARD_DO_DSI_INIT
 	select MAINBOARD_HAS_CHROMEOS
-	select VIRTUAL_DEV_SWITCH
 	select RAM_CODE_SUPPORT
 
 config CHROMEOS
 	select CHROMEOS_VBNV_FLASH
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/storm/Kconfig

@@ -31,13 +31,13 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_FLASH
 	select SPI_FLASH_SPANSION
 	select SPI_FLASH_STMICRO
-	select VIRTUAL_DEV_SWITCH
 	select DRIVERS_UART
 	select CONSOLE_CBMEM_DUMP_TO_UART
 
 config CHROMEOS
 	select VBOOT_DISABLE_DEV_ON_RECOVERY
 	select WIPEOUT_SUPPORTED
+	select VIRTUAL_DEV_SWITCH
 
 config BOARD_VARIANT_AP148
 	bool "pick this to build an image for ap148"

src/mainboard/google/veyron_brain/Kconfig

@@ -33,11 +33,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select CHROMEOS_VBNV_FLASH
 	select PHYSICAL_REC_SWITCH
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/veyron_jerry/Kconfig

@@ -35,11 +35,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select CHROMEOS_VBNV_EC
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/veyron_mickey/Kconfig

@@ -33,11 +33,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select CHROMEOS_VBNV_FLASH
 	select PHYSICAL_REC_SWITCH
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/veyron_mighty/Kconfig

@@ -35,11 +35,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select CHROMEOS_VBNV_EC
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/veyron_minnie/Kconfig

@@ -35,11 +35,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select CHROMEOS_VBNV_EC
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/veyron_pinky/Kconfig

@@ -35,11 +35,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select CHROMEOS_VBNV_EC
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/veyron_rialto/Kconfig

@@ -33,11 +33,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select CHROMEOS_VBNV_FLASH
 	select PHYSICAL_REC_SWITCH
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/veyron_romy/Kconfig

@@ -33,11 +33,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select CHROMEOS_VBNV_FLASH
 	select PHYSICAL_REC_SWITCH
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/veyron_shark/Kconfig

@@ -35,11 +35,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select CHROMEOS_VBNV_EC
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/google/veyron_speedy/Kconfig

@@ -35,11 +35,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select CHROMEOS_VBNV_EC
 	select EC_SOFTWARE_SYNC
+	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
 	string

src/mainboard/intel/kunimitsu/Kconfig

@@ -17,13 +17,13 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MMCONF_SUPPORT
 	select MONOTONIC_TIMER_MSR
 	select SOC_INTEL_SKYLAKE
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select CHROMEOS_RAMOOPS_DYNAMIC
 	select CHROMEOS_VBNV_CMOS
 	select LID_SWITCH
 	select VBOOT_OPROM_MATTERS
+	select VIRTUAL_DEV_SWITCH
 
 config IRQ_SLOT_COUNT
 	int

src/mainboard/intel/sklrvp/Kconfig

@@ -14,13 +14,13 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MONOTONIC_TIMER_MSR
 	select PCIEXP_L1_SUB_STATE
 	select SOC_INTEL_SKYLAKE
-	select VBOOT_DYNAMIC_WORK_BUFFER
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select LID_SWITCH
 	select CHROMEOS_RAMOOPS_DYNAMIC
 	select CHROMEOS_VBNV_CMOS
+	select VBOOT_DYNAMIC_WORK_BUFFER
+	select VIRTUAL_DEV_SWITCH
 
 config IRQ_SLOT_COUNT
 	int

src/mainboard/intel/strago/Kconfig

@@ -15,14 +15,13 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LPC_TPM
 	select SOC_INTEL_BRASWELL
-	select VBOOT_DYNAMIC_WORK_BUFFER
-	select VIRTUAL_DEV_SWITCH
 
 config CHROMEOS
 	select LID_SWITCH
 	select CHROMEOS_VBNV_CMOS
 	select EC_SOFTWARE_SYNC
-
+	select VBOOT_DYNAMIC_WORK_BUFFER
+	select VIRTUAL_DEV_SWITCH
 
 config DISPLAY_SPD_DATA
 	bool "Display Memory Serial Presence Detect Data"