From 0a9b73a13e3440994d4b245ffdc86c51361a296d Mon Sep 17 00:00:00 2001 From: Simon Glass <sjg@chromium.org> Date: Sat, 24 Sep 2016 18:20:08 -0600 Subject: [PATCH] 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> --- common/spl/Makefile | 1 + drivers/mtd/spi/spi_spl_load.c => common/spl/spl_spi.c | 0 drivers/mtd/spi/Makefile | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename drivers/mtd/spi/spi_spl_load.c => common/spl/spl_spi.c (100%) 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 similarity index 100% rename from drivers/mtd/spi/spi_spl_load.c rename to 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 -- 2.39.5