2 files changed, 13 insertions, 7 deletions
diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index 0464e2d25e..817fcc9596 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -1,7 +1,6 @@
-if BOARD_GOOGLE_REEF
 
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
+config BOARD_GOOGLE_BASEBOARD_REEF
+	def_bool n
 	select SOC_INTEL_APOLLOLAKE
 	select BOARD_ROMSIZE_KB_16384
 	select EC_GOOGLE_CHROMEEC
@@ -10,10 +9,15 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_ACPI_TABLES
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LPC_TPM
+
+if BOARD_GOOGLE_BASEBOARD_REEF
+
+config BASEBOARD_REEF_LAPTOP
+	def_bool n
 	select SYSTEM_TYPE_LAPTOP
 
 config CHROMEOS
-	select LID_SWITCH
+	select LID_SWITCH if BASEBOARD_REEF_LAPTOP
 
 config DRIVERS_I2C_DA7219
 	default y
@@ -30,16 +34,16 @@ config MAINBOARD_DIR
 
 config MAINBOARD_PART_NUMBER
 	string
-	default "Reef"
+	default "Reef" if BOARD_GOOGLE_REEF
 
 config MAINBOARD_FAMILY
 	string
-	default "Google_Reef"
+	default "Google_Reef" if BOARD_GOOGLE_REEF
 
 config GBB_HWID
 	string
 	depends on CHROMEOS
-	default "REEF TEST 3240"
+	default "REEF TEST 3240" if BOARD_GOOGLE_REEF
 
 config MAX_CPUS
 	int
diff --git a/src/mainboard/google/reef/Kconfig.name b/src/mainboard/google/reef/Kconfig.name
index c3c85434a5..926f61dc4a 100644
--- a/src/mainboard/google/reef/Kconfig.name
+++ b/src/mainboard/google/reef/Kconfig.name
@@ -1,2 +1,4 @@
 config BOARD_GOOGLE_REEF
 	bool "Reef"
+	select BOARD_GOOGLE_BASEBOARD_REEF
+	select BASEBOARD_REEF_LAPTOP