summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2020-02-28 22:35:56 +0100
committerPatrick Georgi <pgeorgi@google.com>2020-03-02 11:49:50 +0000
commitcb06cfeca6d9bdfc9b7ae311180d3903e13b7ba7 (patch)
treeee8ede19a4608cee638450a726379f6bec4e45e4
parent1ee3dbc63b3514b93927b40add395a31b4f1915e (diff)
downloadcoreboot-cb06cfeca6d9bdfc9b7ae311180d3903e13b7ba7.tar.xz
soc/intel/apollolake: Fix flashconsole, again
This time, it failed to build if measured boot was not enabled. Fix this problem, and make sure flashconsole will not break like that again. Change-Id: I5f5ffd14a3225804524cb0c1518e3d99737e0a93 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39164 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
-rw-r--r--configs/config.google_octopus_spi_flash_console4
-rw-r--r--src/soc/intel/apollolake/Makefile.inc2
2 files changed, 5 insertions, 1 deletions
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