6 files changed, 19 insertions, 8 deletions
diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig
index f9161388dc..47aca1a893 100644
--- a/src/mainboard/intel/baskingridge/Kconfig
+++ b/src/mainboard/intel/baskingridge/Kconfig
@@ -13,6 +13,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LPC_TPM
 	select INTEL_INT15
+
+config CHROMEOS
 	select CHROMEOS_VBNV_CMOS
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index 74b827052f..90b40ac4bf 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -12,6 +12,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_RESUME
 	select INTEL_INT15
 	#select MAINBOARD_HAS_CHROMEOS
+
+config CHROMEOS
 	#select CHROMEOS_VBNV_CMOS
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig
index cb7ce29a39..4cdb2727b2 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -4,8 +4,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
 	select CACHE_ROM
-	select CHROMEOS_RAMOOPS_DYNAMIC
-	select CHROMEOS_VBNV_CMOS
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_LPC
 	select EC_GOOGLE_CHROMEEC_MEC
@@ -14,15 +12,19 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_SMI_HANDLER
-	select LID_SWITCH
 	select MAINBOARD_HAS_CHROMEOS
 	select MARK_GRAPHICS_MEM_WRCOMB
 	select MMCONF_SUPPORT
 	select MONOTONIC_TIMER_MSR
 	select SOC_INTEL_SKYLAKE
-	select VBOOT_OPROM_MATTERS
 	select VIRTUAL_DEV_SWITCH
 
+config CHROMEOS
+	select CHROMEOS_RAMOOPS_DYNAMIC
+	select CHROMEOS_VBNV_CMOS
+	select LID_SWITCH
+	select VBOOT_OPROM_MATTERS
+
 config IRQ_SLOT_COUNT
 	int
 	default 18
diff --git a/src/mainboard/intel/sklrvp/Kconfig b/src/mainboard/intel/sklrvp/Kconfig
index 1741469f5f..b69600dd7c 100644
--- a/src/mainboard/intel/sklrvp/Kconfig
+++ b/src/mainboard/intel/sklrvp/Kconfig
@@ -4,8 +4,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
 	select CACHE_ROM
-	select CHROMEOS_RAMOOPS_DYNAMIC
-	select CHROMEOS_VBNV_CMOS
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
@@ -18,7 +16,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	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
 
 config IRQ_SLOT_COUNT
 	int
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig
index 599a84a7fd..0a59e9bbc0 100755
--- a/src/mainboard/intel/strago/Kconfig
+++ b/src/mainboard/intel/strago/Kconfig
@@ -5,11 +5,9 @@ config BOARD_SPECIFIC_OPTIONS
 	select VGA_ROM_RUN if !PAYLOAD_SEABIOS
 	select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS
 	select BOARD_ROMSIZE_KB_8192
-	select CHROMEOS_VBNV_CMOS
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_MEC
 	select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP
-	select EC_SOFTWARE_SYNC
 	select ENABLE_BUILTIN_COM1
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
@@ -19,7 +17,11 @@ config BOARD_SPECIFIC_OPTIONS
 	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
 
 
 config DISPLAY_SPD_DATA
diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig
index b8f616a1e8..e739efaad6 100644
--- a/src/mainboard/intel/wtm2/Kconfig
+++ b/src/mainboard/intel/wtm2/Kconfig
@@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select INTEL_INT15
 
+config CHROMEOS
 	select CHROMEOS_RAMOOPS_DYNAMIC
 	select CHROMEOS_VBNV_CMOS