3 files changed, 9 insertions, 31 deletions
diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig
index 4af998633b..2aa436238c 100644
--- a/src/mainboard/google/cosmos/Kconfig
+++ b/src/mainboard/google/cosmos/Kconfig
@@ -25,10 +25,13 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select BOARD_ID_SUPPORT
 	select CHROMEOS
 	select CHROMEOS_VBNV_FLASH
-	select SOC_MARVELL_BG4CD
-	select MAINBOARD_HAS_BOOTBLOCK_INIT
+	select COMMON_CBFS_SPI_WRAPPER
 	select HAVE_HARD_RESET
+	select MAINBOARD_HAS_BOOTBLOCK_INIT
 	select RETURN_FROM_VERSTAGE
+	select SOC_MARVELL_BG4CD
+	select SPI_FLASH
+	select SPI_FLASH_SPANSION
 
 config MAINBOARD_DIR
 	string
diff --git a/src/soc/marvell/bg4cd/Makefile.inc b/src/soc/marvell/bg4cd/Makefile.inc
index 7d49486254..af390d168b 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 $< $@
diff --git a/src/soc/marvell/bg4cd/media.c b/src/soc/marvell/bg4cd/media.c
deleted file mode 100644
index 5a4dc5f56f..0000000000
--- a/src/soc/marvell/bg4cd/media.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2014 Google Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <cbfs.h>
-
-int init_default_cbfs_media(struct cbfs_media *media)
-{
-	return 0;
-}