diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index 42019c79f6..5fafa8baf7 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -17,15 +17,7 @@ config BOOT_MEDIA_SPI_BUS
 	default 0
 
 config CHROMEOS
-	select CHROMEOS_RAMOOPS_DYNAMIC
-	select CHROMEOS_VBNV_CMOS
-	select CHROMEOS_VBNV_CMOS_BACKUP_TO_FLASH
-	select EC_SOFTWARE_SYNC
 	select LID_SWITCH
-	select SEPARATE_VERSTAGE
-	select VBOOT_OPROM_MATTERS
-	select VBOOT_STARTS_IN_BOOTBLOCK
-	select VIRTUAL_DEV_SWITCH
 
 config DRIVERS_I2C_DA7219
 	default y
diff --git a/src/mainboard/intel/amenia/Kconfig b/src/mainboard/intel/amenia/Kconfig
index dd04a6f625..2a4189e041 100644
--- a/src/mainboard/intel/amenia/Kconfig
+++ b/src/mainboard/intel/amenia/Kconfig
@@ -16,9 +16,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select TPM_ON_FAST_SPI
 
 config CHROMEOS
-	bool
-	default y
-	select VIRTUAL_DEV_SWITCH
+	select LID_SWITCH
 
 config MAINBOARD_DIR
 	string
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index d36fc064db..b013da15c2 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -57,6 +57,16 @@ config CPU_SPECIFIC_OPTIONS
 	select SOC_INTEL_COMMON_GFX_OPREGION
 	select ADD_VBT_DATA_FILE
 
+config CHROMEOS
+	select CHROMEOS_RAMOOPS_DYNAMIC
+	select CHROMEOS_VBNV_CMOS
+	select CHROMEOS_VBNV_CMOS_BACKUP_TO_FLASH
+	select EC_SOFTWARE_SYNC if EC_GOOGLE_CHROMEEC
+	select SEPARATE_VERSTAGE
+	select VBOOT_OPROM_MATTERS
+	select VBOOT_STARTS_IN_BOOTBLOCK
+	select VIRTUAL_DEV_SWITCH
+
 config TPM_ON_FAST_SPI
 	bool
 	default n