diff --git a/configs/config.google_octopus_spi_flash_console b/configs/config.google_octopus_spi_flash_console
new file mode 100644
index 0000000000..df8889b019
--- /dev/null
+++ b/configs/config.google_octopus_spi_flash_console
@@ -0,0 +1,4 @@
+CONFIG_VENDOR_GOOGLE=y
+CONFIG_BOARD_GOOGLE_OCTOPUS=y
+CONFIG_CONSOLE_SPI_FLASH=y
+# CONFIG_VBOOT_MEASURED_BOOT is not set
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index b420dea64d..a20a554be1 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -78,7 +78,7 @@ postcar-y += i2c.c
 postcar-y += heci.c
 postcar-y += reset.c
 postcar-y += uart.c
-postcar-$(CONFIG_VBOOT_MEASURED_BOOT) += gspi.c
+postcar-y += gspi.c
 
 verstage-y += car.c
 verstage-y += i2c.c