diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 5bd268a703..d513672d62 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -9,60 +9,87 @@ config BOARD_GOOGLE_BASEBOARD_RAMBI
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_SPD_IN_CBFS
-	select INTEL_GMA_HAVE_VBT if !BOARD_GOOGLE_RAMBI
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
 	select SOC_INTEL_BAYTRAIL
-	select SYSTEM_TYPE_LAPTOP if !BOARD_GOOGLE_NINJA && !BOARD_GOOGLE_SUMO
 
 config BOARD_GOOGLE_BANJO
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_CANDY
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_CLAPPER
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_ENGUARDE
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_GLIMMER
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_GNAWTY
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_HELI
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_KIP
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_NINJA
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_ORCO
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_QUAWKS
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_SQUAWKS
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_RAMBI
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_SUMO
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_SWANKY
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_WINKY
 	select BOARD_GOOGLE_BASEBOARD_RAMBI
+	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_LAPTOP
 
 if BOARD_GOOGLE_BASEBOARD_RAMBI