From 3486d1fbe8deaf2062bd4c0c14b7f96f78dfce8f Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Thu, 16 Oct 2014 11:24:12 -0700 Subject: verstage should include the CBFS SPI wrapper, when configured Vboot2 targets so far did not have COMMON_CBFS_SPI_WRAPPER configuration option enabled, so the verstage is missing the relevant files in some Makefiles. This patch fixes the problem. BRANCH=none BUG=none TEST=with the rest of the patches applied cosmos target builds fine with COMMON_CBFS_SPI_WRAPPER enabled Change-Id: I3ce78c8afc5f7d8ce822bbf8dd789c0c2ba4b99c Signed-off-by: Patrick Georgi Original-Commit-Id: b72693c96f7d8ce94ce6fe12b316d5b88fded579 Original-Change-Id: Iab813b9f5b0156c45b007fe175500ef0de50e65c Original-Signed-off-by: Vadim Bendebury Original-Reviewed-on: https://chromium-review.googlesource.com/223751 Original-Reviewed-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/8772 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks --- src/drivers/spi/Makefile.inc | 11 +++++++++++ src/lib/Makefile.inc | 3 +++ 2 files changed, 14 insertions(+) diff --git a/src/drivers/spi/Makefile.inc b/src/drivers/spi/Makefile.inc index 1bada7975c..ade34a2988 100644 --- a/src/drivers/spi/Makefile.inc +++ b/src/drivers/spi/Makefile.inc @@ -20,6 +20,17 @@ romstage-$(CONFIG_SPI_FLASH_SST) += sst.c romstage-$(CONFIG_SPI_FLASH_STMICRO) += stmicro.c romstage-$(CONFIG_SPI_FLASH_WINBOND) += winbond.c romstage-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.c + +verstage-$(CONFIG_SPI_FLASH) += spi_flash.c +verstage-$(CONFIG_SPI_FLASH_EON) += eon.c +verstage-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.c +verstage-$(CONFIG_SPI_FLASH_MACRONIX) += macronix.c +verstage-$(CONFIG_SPI_FLASH_SPANSION) += spansion.c +verstage-$(CONFIG_SPI_FLASH_SST) += sst.c +verstage-$(CONFIG_SPI_FLASH_STMICRO) += stmicro.c +verstage-$(CONFIG_SPI_FLASH_WINBOND) += winbond.c +verstage-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.c + endif ramstage-$(CONFIG_SPI_FLASH) += spi_flash.c diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index e599066b5e..d1e3a92b21 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -29,6 +29,9 @@ verstage-y += delay.c verstage-y += cbfs.c verstage-y += memcmp.c verstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c +verstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c +verstage-y += tlcl.c +verstage-$(CONFIG_GENERIC_UDELAY) += timer.c romstage-y += memchr.c -- cgit v1.2.3