13 files changed, 0 insertions, 27 deletions

diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index b691cd16e3dd..ca760780edd0 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -22,8 +22,6 @@ config BASEBOARD_BRYA_LAPTOP
 	select SYSTEM_TYPE_LAPTOP
 
 config CHROMEOS
-	bool
-	default y
 	select EC_GOOGLE_CHROMEEC_SWITCHES
 	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
 	select VBOOT_LID_SWITCH
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig
index 69280025ee3a..466a672eb888 100644
--- a/src/mainboard/google/dedede/Kconfig
+++ b/src/mainboard/google/dedede/Kconfig
@@ -38,8 +38,6 @@ config BASEBOARD_DEDEDE_LAPTOP
 	select SYSTEM_TYPE_LAPTOP
 
 config CHROMEOS
-	bool
-	default y
 	select CHROMEOS_CSE_BOARD_RESET_OVERRIDE
 	select CHROMEOS_DRAM_PART_NUMBER_IN_CBI
 	select EC_GOOGLE_CHROMEEC_SWITCHES
diff --git a/src/mainboard/google/deltaur/Kconfig b/src/mainboard/google/deltaur/Kconfig
index 8d958493bd6b..d351d85b96ca 100644
--- a/src/mainboard/google/deltaur/Kconfig
+++ b/src/mainboard/google/deltaur/Kconfig
@@ -22,8 +22,6 @@ config BOARD_GOOGLE_BASEBOARD_DELTAUR
 if BOARD_GOOGLE_BASEBOARD_DELTAUR
 
 config CHROMEOS
-	bool
-	default y
 	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
 	select GBB_FLAG_FORCE_DEV_SWITCH_ON
 	select GBB_FLAG_FORCE_DEV_BOOT_USB
diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig
index 747010702c25..311f3f6c0b98 100644
--- a/src/mainboard/google/drallion/Kconfig
+++ b/src/mainboard/google/drallion/Kconfig
@@ -28,8 +28,6 @@ config BOARD_GOOGLE_BASEBOARD_DRALLION
 if BOARD_GOOGLE_BASEBOARD_DRALLION
 
 config CHROMEOS
-	bool
-	default y
 	select GBB_FLAG_FORCE_DEV_SWITCH_ON
 	select GBB_FLAG_FORCE_DEV_BOOT_USB
 	select GBB_FLAG_FORCE_DEV_BOOT_LEGACY
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index d0883413241e..1c10522455e3 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -45,8 +45,6 @@ config BOARD_GOOGLE_HATCH_COMMON
 if BOARD_GOOGLE_HATCH_COMMON
 
 config CHROMEOS
-	bool
-	default y
 	select CHROMEOS_DRAM_PART_NUMBER_IN_CBI if !ROMSTAGE_SPD_SMBUS
 	select EC_GOOGLE_CHROMEEC_SWITCHES
 	select GBB_FLAG_FORCE_DEV_SWITCH_ON
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 7e8e277e1716..ba01fe3d5fd9 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -43,8 +43,6 @@ config BASEBOARD_OCTOPUS_LAPTOP
 	select SYSTEM_TYPE_LAPTOP
 
 config CHROMEOS
-	bool
-	default y
 	select EC_GOOGLE_CHROMEEC_SWITCHES
 	select HAS_RECOVERY_MRC_CACHE
 	select VBOOT_LID_SWITCH
diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig
index 444234af4594..9893acfb783e 100644
--- a/src/mainboard/google/sarien/Kconfig
+++ b/src/mainboard/google/sarien/Kconfig
@@ -31,8 +31,6 @@ config BOARD_GOOGLE_BASEBOARD_SARIEN
 if BOARD_GOOGLE_BASEBOARD_SARIEN
 
 config CHROMEOS
-	bool
-	default y
 	select GBB_FLAG_FORCE_DEV_SWITCH_ON
 	select GBB_FLAG_FORCE_DEV_BOOT_USB
 	select GBB_FLAG_FORCE_DEV_BOOT_LEGACY
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 3217d07f71c2..f4d121ed3d30 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -38,8 +38,6 @@ config BOARD_GOOGLE_BASEBOARD_VOLTEER
 if BOARD_GOOGLE_BASEBOARD_VOLTEER
 
 config CHROMEOS
-	bool
-	default y
 	select CHROMEOS_CSE_BOARD_RESET_OVERRIDE
 	select CHROMEOS_DRAM_PART_NUMBER_IN_CBI
 	select EC_GOOGLE_CHROMEEC_SWITCHES
diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig
index 35224a14ce8a..80d52548fb6d 100644
--- a/src/mainboard/intel/adlrvp/Kconfig
+++ b/src/mainboard/intel/adlrvp/Kconfig
@@ -18,8 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select PCIEXP_HOTPLUG
 
 config CHROMEOS
-	bool
-	default y
 	select GBB_FLAG_FORCE_DEV_SWITCH_ON
 	select GBB_FLAG_FORCE_DEV_BOOT_USB
 	select GBB_FLAG_FORCE_DEV_BOOT_LEGACY
diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig
index 0f8075bf4f3a..e4c2d90a9564 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig
@@ -44,9 +44,6 @@ config MAINBOARD_FAMILY
 	default "Intel_cflrvp"
 
 config CHROMEOS
-	bool
-	default n if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8
-	default y
 	select GBB_FLAG_FORCE_MANUAL_RECOVERY
 
 config MAX_CPUS
diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig
index 172dfa2e9747..7fda90d98a43 100644
--- a/src/mainboard/intel/glkrvp/Kconfig
+++ b/src/mainboard/intel/glkrvp/Kconfig
@@ -38,8 +38,6 @@ config GLK_INTEL_EC
 endchoice
 
 config CHROMEOS
-	bool
-	default y
 	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
 	select VBOOT_LID_SWITCH if GLK_CHROME_EC
 
diff --git a/src/mainboard/intel/jasperlake_rvp/Kconfig b/src/mainboard/intel/jasperlake_rvp/Kconfig
index 7bfd15878c37..8dec42a2a897 100644
--- a/src/mainboard/intel/jasperlake_rvp/Kconfig
+++ b/src/mainboard/intel/jasperlake_rvp/Kconfig
@@ -51,8 +51,6 @@ config DIMM_SPD_SIZE
 	default 512
 
 config CHROMEOS
-	bool
-	default y
 	select GBB_FLAG_FORCE_DEV_SWITCH_ON
 	select GBB_FLAG_FORCE_DEV_BOOT_USB
 	select GBB_FLAG_FORCE_DEV_BOOT_LEGACY
diff --git a/src/mainboard/intel/tglrvp/Kconfig b/src/mainboard/intel/tglrvp/Kconfig
index 9df542dfa6cc..233706d94915 100644
--- a/src/mainboard/intel/tglrvp/Kconfig
+++ b/src/mainboard/intel/tglrvp/Kconfig
@@ -26,8 +26,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_TPM
 
 config CHROMEOS
-	bool
-	default y
 	select EC_GOOGLE_CHROMEEC_SWITCHES if TGL_CHROME_EC
 	select GBB_FLAG_FORCE_MANUAL_RECOVERY
 	select HAS_RECOVERY_MRC_CACHE