7 files changed, 2 insertions, 3 deletions
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index 52907cc683..bc0c67ba46 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -20,6 +20,7 @@ config BOARD_GOOGLE_BASEBOARD_GLADOS
 	select SOC_INTEL_SKYLAKE
 	select SYSTEM_TYPE_LAPTOP
 	select MAINBOARD_HAS_LIBGFXINIT
+	select MAINBOARD_NO_FSP_GOP if !BOARD_GOOGLE_GLADOS
 
 if BOARD_GOOGLE_BASEBOARD_GLADOS
 
@@ -63,9 +64,6 @@ config DEVICETREE
 	string
 	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
-config INTEL_GMA_VBT_FILE
-	default "3rdparty/fsp/KabylakeFspBinPkg/SampleCode/Vbt/Vbt.bin"
-
 config MAX_CPUS
 	int
 	default 8
@@ -94,4 +92,5 @@ config EC_GOOGLE_CHROMEEC_PD_BOARDNAME
 config UART_FOR_CONSOLE
 	int
 	default 2
+
 endif
diff --git a/src/mainboard/google/glados/variants/asuka/data.vbt b/src/mainboard/google/glados/variants/asuka/data.vbt
new file mode 100644
index 0000000000..8f2a7b0614
--- /dev/null
+++ b/src/mainboard/google/glados/variants/asuka/data.vbt
diff --git a/src/mainboard/google/glados/variants/caroline/data.vbt b/src/mainboard/google/glados/variants/caroline/data.vbt
new file mode 100644
index 0000000000..02e1cd10f6
--- /dev/null
+++ b/src/mainboard/google/glados/variants/caroline/data.vbt
diff --git a/src/mainboard/google/glados/variants/cave/data.vbt b/src/mainboard/google/glados/variants/cave/data.vbt
new file mode 100644
index 0000000000..02e1cd10f6
--- /dev/null
+++ b/src/mainboard/google/glados/variants/cave/data.vbt
diff --git a/src/mainboard/google/glados/variants/chell/data.vbt b/src/mainboard/google/glados/variants/chell/data.vbt
new file mode 100644
index 0000000000..a654a5efd5
--- /dev/null
+++ b/src/mainboard/google/glados/variants/chell/data.vbt
diff --git a/src/mainboard/google/glados/variants/lars/data.vbt b/src/mainboard/google/glados/variants/lars/data.vbt
new file mode 100644
index 0000000000..0aac82c3b1
--- /dev/null
+++ b/src/mainboard/google/glados/variants/lars/data.vbt
diff --git a/src/mainboard/google/glados/variants/sentry/data.vbt b/src/mainboard/google/glados/variants/sentry/data.vbt
new file mode 100644
index 0000000000..0aac82c3b1
--- /dev/null
+++ b/src/mainboard/google/glados/variants/sentry/data.vbt