bg4cd, cosmos: use SPI_WRAPPER configuration mode

The SOC code should include the SPI controller driver when configured.
Enable SPI support for cosmos.

BRANCH=none
BUG=chrome-os-partner:32631
TEST=cosmos builds

Change-Id: I8212f191b7d80f0bee86f746813edaf8e5ee6db1
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: fd4853be5157247bb73fc22b9d4f8300228fe6ce
Original-Change-Id: If7e12e2fb04e63c36d9696d13e08397b91a77a8c
Original-Commit-Id: 7b1d095e5df6a864d3564bbf7a20cc211f75629a
Original-Change-Id: If9dd80cb96120d34a0865f7882cd62e45fed749d
Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/223750
Original-Reviewed-on: https://chromium-review.googlesource.com/223752
Reviewed-on: http://review.coreboot.org/9356
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
diff --git a/src/soc/marvell/bg4cd/Makefile.inc b/src/soc/marvell/bg4cd/Makefile.inc
index 7d49486..af390d1 100644
--- a/src/soc/marvell/bg4cd/Makefile.inc
+++ b/src/soc/marvell/bg4cd/Makefile.inc
@@ -19,23 +19,23 @@
 
 bootblock-y += cbmem.c
 bootblock-y += i2c.c
-bootblock-y += media.c
 bootblock-y += monotonic_timer.c
+bootblock-$(CONFIG_SPI_FLASH) += spi.c
 
 verstage-y += i2c.c
-verstage-y += media.c
 verstage-y += monotonic_timer.c
+verstage-$(CONFIG_SPI_FLASH) += spi.c
 
 romstage-y += cbmem.c
 romstage-y += i2c.c
-romstage-y += media.c
 romstage-y += monotonic_timer.c
 romstage-y += sdram.c
+romstage-$(CONFIG_SPI_FLASH) += spi.c
 
 ramstage-y += cbmem.c
 ramstage-y += i2c.c
-ramstage-y += media.c
 ramstage-y += monotonic_timer.c
+ramstage-$(CONFIG_SPI_FLASH) += spi.c
 
 $(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf
 	cp $< $@