summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-09-24 18:20:08 -0600
committerTom Rini <trini@konsulko.com>2016-10-06 15:07:33 -0400
commit0a9b73a13e3440994d4b245ffdc86c51361a296d (patch)
treea09c2e012eaba694a0be9e864106ea38041b207b
parent7557147927fcc4099d62f564f42babc2370834f3 (diff)
spl: spi: Move the generic SPI loader into common/spl
All the other SPL loaders are in this directory, so move the SPI one in there too. There are two board-specific SPI loaders (fsl and sunxi). These remain in the drivers/mtd/spi directory, since they do not contain generic code. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
-rw-r--r--common/spl/Makefile1
-rw-r--r--common/spl/spl_spi.c (renamed from drivers/mtd/spi/spi_spl_load.c)0
-rw-r--r--drivers/mtd/spi/Makefile1
3 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/Makefile b/common/spl/Makefile
index 5bd0b1841e..ed02635e72 100644
--- a/common/spl/Makefile
+++ b/common/spl/Makefile
@@ -25,4 +25,5 @@ obj-$(CONFIG_SPL_FAT_SUPPORT) += spl_fat.o
obj-$(CONFIG_SPL_EXT_SUPPORT) += spl_ext.o
obj-$(CONFIG_SPL_SATA_SUPPORT) += spl_sata.o
obj-$(CONFIG_SPL_DFU_SUPPORT) += spl_dfu.o
+obj-$(CONFIG_SPL_SPI_LOAD) += spl_spi.o
endif
diff --git a/drivers/mtd/spi/spi_spl_load.c b/common/spl/spl_spi.c
index e4cc0d0822..e4cc0d0822 100644
--- a/drivers/mtd/spi/spi_spl_load.c
+++ b/common/spl/spl_spi.c
diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile
index 6f47a66f40..f3dc409632 100644
--- a/drivers/mtd/spi/Makefile
+++ b/drivers/mtd/spi/Makefile
@@ -8,7 +8,6 @@
obj-$(CONFIG_DM_SPI_FLASH) += sf-uclass.o
ifdef CONFIG_SPL_BUILD
-obj-$(CONFIG_SPL_SPI_LOAD) += spi_spl_load.o
obj-$(CONFIG_SPL_SPI_BOOT) += fsl_espi_spl.o
obj-$(CONFIG_SPL_SPI_SUNXI) += sunxi_spi_spl.o
endif