From cb06cfeca6d9bdfc9b7ae311180d3903e13b7ba7 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Fri, 28 Feb 2020 22:35:56 +0100 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/39164 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- configs/config.google_octopus_spi_flash_console | 4 ++++ src/soc/intel/apollolake/Makefile.inc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 configs/config.google_octopus_spi_flash_console 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 -- cgit v1.2.3