From e25b74b8b0f12ae0bdfa2a3a8a8c9b0f072daf40 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 11 Aug 2016 17:04:42 -0500 Subject: [PATCH] UPSTREAM: drivers/spi: include SPI flash modules for all stages It shouldn't matter if COMMON_CBFS_SPI_WRAPPER is selected to include the SPI flash support in all stages. Therefore, include the SPI flash support files in all the stages. While there include the same set of files for all stages. They were out of sync for some reason. BUG=chrome-os-partner:56151 BRANCH=None TEST=None Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/16198 Reviewed-by: Furquan Shaikh Reviewed-by: Paul Menzel Reviewed-by: Martin Roth Change-Id: I933335104203315cbbcf965185a7c176974e6356 Reviewed-on: https://chromium-review.googlesource.com/373361 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/drivers/spi/Makefile.inc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/drivers/spi/Makefile.inc b/src/drivers/spi/Makefile.inc index e976059fda..8fd59846dc 100644 --- a/src/drivers/spi/Makefile.inc +++ b/src/drivers/spi/Makefile.inc @@ -7,9 +7,11 @@ ramstage-y += spiconsole.c smm-$(CONFIG_DEBUG_SMI) += spiconsole.c endif -ifeq ($(CONFIG_COMMON_CBFS_SPI_WRAPPER),y) bootblock-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c -bootblock-y += spi_flash.c +bootblock-$(CONFIG_SPI_FLASH) += spi_flash.c +bootblock-$(CONFIG_SPI_FLASH_ADESTO) += adesto.c +bootblock-$(CONFIG_SPI_FLASH_AMIC) += amic.c +bootblock-$(CONFIG_SPI_FLASH_ATMEL) += atmel.c bootblock-$(CONFIG_SPI_FLASH_EON) += eon.c bootblock-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.c bootblock-$(CONFIG_SPI_FLASH_MACRONIX) += macronix.c @@ -21,6 +23,9 @@ bootblock-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.c romstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c romstage-$(CONFIG_SPI_FLASH) += spi_flash.c +romstage-$(CONFIG_SPI_FLASH_ADESTO) += adesto.c +romstage-$(CONFIG_SPI_FLASH_AMIC) += amic.c +romstage-$(CONFIG_SPI_FLASH_ATMEL) += atmel.c romstage-$(CONFIG_SPI_FLASH_EON) += eon.c romstage-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.c romstage-$(CONFIG_SPI_FLASH_MACRONIX) += macronix.c @@ -32,6 +37,9 @@ romstage-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.c verstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c verstage-$(CONFIG_SPI_FLASH) += spi_flash.c +verstage-$(CONFIG_SPI_FLASH_ADESTO) += adesto.c +verstage-$(CONFIG_SPI_FLASH_AMIC) += amic.c +verstage-$(CONFIG_SPI_FLASH_ATMEL) += atmel.c verstage-$(CONFIG_SPI_FLASH_EON) += eon.c verstage-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.c verstage-$(CONFIG_SPI_FLASH_MACRONIX) += macronix.c @@ -41,12 +49,8 @@ verstage-$(CONFIG_SPI_FLASH_STMICRO) += stmicro.c verstage-$(CONFIG_SPI_FLASH_WINBOND) += winbond.c verstage-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.c -endif - ramstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c ramstage-$(CONFIG_SPI_FLASH) += spi_flash.c - -# drivers ramstage-$(CONFIG_SPI_FLASH_ADESTO) += adesto.c ramstage-$(CONFIG_SPI_FLASH_AMIC) += amic.c ramstage-$(CONFIG_SPI_FLASH_ATMEL) += atmel.c