2 files changed, 48 insertions, 16 deletions

diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 69fb843463..5bd268a703 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -16,6 +16,54 @@ config BOARD_GOOGLE_BASEBOARD_RAMBI
 	select SOC_INTEL_BAYTRAIL
 	select SYSTEM_TYPE_LAPTOP if !BOARD_GOOGLE_NINJA && !BOARD_GOOGLE_SUMO
 
+config BOARD_GOOGLE_BANJO
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_CANDY
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_CLAPPER
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_ENGUARDE
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_GLIMMER
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_GNAWTY
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_HELI
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_KIP
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_NINJA
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_ORCO
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_QUAWKS
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_SQUAWKS
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_RAMBI
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_SUMO
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_SWANKY
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
+config BOARD_GOOGLE_WINKY
+	select BOARD_GOOGLE_BASEBOARD_RAMBI
+
 if BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config VBOOT
diff --git a/src/mainboard/google/rambi/Kconfig.name b/src/mainboard/google/rambi/Kconfig.name
index fe26faae9a..bae223e743 100644
--- a/src/mainboard/google/rambi/Kconfig.name
+++ b/src/mainboard/google/rambi/Kconfig.name
@@ -2,64 +2,48 @@ comment "Rambi"
 
 config BOARD_GOOGLE_BANJO
 	bool "->  Banjo (Acer Chromebook 15 (CB3-531))"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_CANDY
 	bool "->  Candy (Dell Chromebook 11 3120)"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_CLAPPER
 	bool "->  Clapper (Lenovo N20 Chromebook)"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_ENGUARDE
 	bool "->  Enguarde"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_GLIMMER
 	bool "->  Glimmer (Lenovo ThinkPad 11e Chromebook)"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_GNAWTY
 	bool "->  Gnawty (Acer Chromebook 11 (CB3-111/131,C730/C730E/C735))"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_HELI
 	bool "->  Heli (Haier Chromebook G2)"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_KIP
 	bool "->  Kip (HP Chromebook 11 G3 / G4 / G4 EE)"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_NINJA
 	bool "->  Ninja (AOpen Chromebox Commercial)"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_ORCO
 	bool "->  Orco (Lenovo 100S Chromebook)"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_QUAWKS
 	bool "->  Quawks (ASUS Chromebook C300)"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_SQUAWKS
 	bool "->  Squawks (ASUS Chromebook C200)"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_RAMBI
 	bool "->  Rambi"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_SUMO
 	bool "->  Sumo (AOpen Chromebase Commercial)"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_SWANKY
 	bool "->  Swanky (Toshiba Chromebook 2)"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI
 
 config BOARD_GOOGLE_WINKY
 	bool "->  Winky (Samsung Chromebook 2 (XE500C12))"
-	select BOARD_GOOGLE_BASEBOARD_RAMBI