drivers/spi: move cbfs_spi.c location

The common boot device spi implementation is very much
specific to SPI flash. As such it should be moved into
that subdirectory. It's still a high-level option but
it correctly depends on BOOT_DEVICE_SPI_FLASH. Additionally
that allows the auto-selection of SPI_FLASH by a platform
selecting COMMON_CBFS_SPI_WRAPPER which allows for culling
of SPI_FLASH selections everywhere.

BUG=chrome-os-partner:56151

Change-Id: Ia2ccfdc9e1a4348cd91b381f9712d8853b7d2a79
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/16212
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth@google.com>

2 files changed, 0 insertions, 85 deletions

diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 5f708a6d3c..e2cf9eff67 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -22,7 +22,6 @@ endif
 bootblock-y += prog_loaders.c
 bootblock-y += prog_ops.c
 bootblock-y += cbfs.c
-bootblock-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
 bootblock-$(CONFIG_GENERIC_GPIO_LIB) += gpio.c
 bootblock-y += libgcc.c
 bootblock-$(CONFIG_GENERIC_UDELAY) += timer.c
@@ -49,7 +48,6 @@ verstage-y += memcmp.c
 verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
 verstage-y += boot_device.c
 verstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
-verstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
 
 ifeq ($(MOCK_TPM),1)
 libverstage-y += mocked_tlcl.c
@@ -73,7 +71,6 @@ $(foreach arch,$(ARCH_SUPPORTED),\
 romstage-y += fmap.c
 romstage-y += delay.c
 romstage-y += cbfs.c
-romstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
 romstage-$(CONFIG_COMPRESS_RAMSTAGE) += lzma.c lzmadecode.c
 romstage-y += libgcc.c
 romstage-y += memrange.c
@@ -117,7 +114,6 @@ ramstage-y += delay.c
 ramstage-y += fallback_boot.c
 ramstage-y += compute_ip_checksum.c
 ramstage-y += cbfs.c
-ramstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
 ramstage-y += lzma.c lzmadecode.c
 ramstage-y += stack.c
 ramstage-y += hexstrtobin.c
@@ -214,7 +210,6 @@ smm-y += halt.c
 postcar-y += bootmode.c
 postcar-y += boot_device.c
 postcar-y += cbfs.c
-postcar-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
 postcar-y += delay.c
 postcar-y += fmap.c
 postcar-y += gcc.c
diff --git a/src/lib/cbfs_spi.c b/src/lib/cbfs_spi.c
deleted file mode 100644
index bbe9125dd5..0000000000
--- a/src/lib/cbfs_spi.c
+++ /dev/null
@@ -1,80 +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.
- */
-
-/*
- * This file provides a common CBFS wrapper for SPI storage. SPI driver
- * context is expanded with the buffer descriptor used to store data read from
- * SPI.
- */
-
-#include <boot_device.h>
-#include <spi_flash.h>
-#include <symbols.h>
-#include <cbmem.h>
-
-static struct spi_flash *spi_flash_info;
-
-static ssize_t spi_readat(const struct region_device *rd, void *b,
-				size_t offset, size_t size)
-{
-	if (spi_flash_info->read(spi_flash_info, offset, size, b))
-		return -1;
-	return size;
-}
-
-static const struct region_device_ops spi_ops = {
-	.mmap = mmap_helper_rdev_mmap,
-	.munmap = mmap_helper_rdev_munmap,
-	.readat = spi_readat,
-};
-
-static struct mmap_helper_region_device mdev =
-	MMAP_HELPER_REGION_INIT(&spi_ops, 0, CONFIG_ROM_SIZE);
-
-static void switch_to_postram_cache(int unused)
-{
-	/*
-	 * Call boot_device_init() to ensure spi_flash is initialized before
-	 * backing mdev with postram cache. This prevents the mdev backing from
-	 * being overwritten if spi_flash was not accessed before dram was up.
-	 */
-	boot_device_init();
-	if (_preram_cbfs_cache != _postram_cbfs_cache)
-		mmap_helper_device_init(&mdev, _postram_cbfs_cache,
-					_postram_cbfs_cache_size);
-}
-ROMSTAGE_CBMEM_INIT_HOOK(switch_to_postram_cache);
-
-void boot_device_init(void)
-{
-	int bus = CONFIG_BOOT_DEVICE_SPI_FLASH_BUS;
-	int cs = 0;
-
-	if (spi_flash_info != NULL)
-		return;
-
-	spi_flash_info = spi_flash_probe(bus, cs);
-
-	mmap_helper_device_init(&mdev, _cbfs_cache, _cbfs_cache_size);
-}
-
-/* Return the CBFS boot device. */
-const struct region_device *boot_device_ro(void)
-{
-	if (spi_flash_info == NULL)
-		return NULL;
-
-	return &mdev.rdev;
-}