 MAINTAINERS                    |    1 -
 Makefile                       |    1 -
 cmd/sf.c                       |    4 +-
 common/env_sf.c                |    4 +-
 drivers/Makefile               |    1 -
 drivers/mtd/Kconfig            |    2 -
 drivers/mtd/spi/Kconfig        |  131 -----
 drivers/mtd/spi/Makefile       |   18 -
 drivers/mtd/spi/fsl_espi_spl.c |   90 ---
 drivers/mtd/spi/sandbox.c      |  697 -----------------------
 drivers/mtd/spi/sf-uclass.c    |  103 ----
 drivers/mtd/spi/sf.c           |   58 --
 drivers/mtd/spi/sf_dataflash.c |  701 ------------------------
 drivers/mtd/spi/sf_internal.h  |  243 ---------
 drivers/mtd/spi/sf_mtd.c       |  104 ----
 drivers/mtd/spi/sf_params.c    |  146 -----
 drivers/mtd/spi/sf_probe.c     |  181 ------
 drivers/mtd/spi/spi_flash.c    | 1182 ----------------------------------------
 drivers/mtd/spi/spi_spl_load.c |   90 ---
 include/spi_flash.h            |  225 +-------
 20 files changed, 6 insertions(+), 3976 deletions(-)
 delete mode 100644 drivers/mtd/spi/Kconfig
 delete mode 100644 drivers/mtd/spi/Makefile
 delete mode 100644 drivers/mtd/spi/fsl_espi_spl.c
 delete mode 100644 drivers/mtd/spi/sandbox.c
 delete mode 100644 drivers/mtd/spi/sf-uclass.c
 delete mode 100644 drivers/mtd/spi/sf.c
 delete mode 100644 drivers/mtd/spi/sf_dataflash.c
 delete mode 100644 drivers/mtd/spi/sf_internal.h
 delete mode 100644 drivers/mtd/spi/sf_mtd.c
 delete mode 100644 drivers/mtd/spi/sf_params.c
 delete mode 100644 drivers/mtd/spi/sf_probe.c
 delete mode 100644 drivers/mtd/spi/spi_flash.c
 delete mode 100644 drivers/mtd/spi/spi_spl_load.c

MAINTAINERS +0 -1

index b387207..4b23d18 100644
@@ -385,7 +385,6 @@ SPI
 M:	Jagan Teki <[email protected]>
 S:	Maintained
 T:	git git://git.denx.de/u-boot-spi.git
-F:	drivers/mtd/spi/
 F:	drivers/spi/
 F:	include/spi*

Makefile +0 -1

index 4e67433..e9579b8 100644
@@ -636,7 +636,6 @@ libs-y += drivers/mtd/
 libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/
 libs-y += drivers/mtd/onenand/
 libs-$(CONFIG_CMD_UBI) += drivers/mtd/ubi/
-libs-y += drivers/mtd/spi/
 libs-y += drivers/mtd/spi-nor/
 libs-y += drivers/net/
 libs-y += drivers/net/phy/

cmd/sf.c +2 -2

index bbdbe52..bf5a3ce 100644
@@ -85,7 +85,7 @@ static int do_spi_flash_probe(int argc, char * const argv[])
 	unsigned int speed = CONFIG_SF_DEFAULT_SPEED;
 	unsigned int mode = CONFIG_SF_DEFAULT_MODE;
 	char *endp;
-#if defined(CONFIG_DM_SPI_FLASH) || defined (CONFIG_DM_MTD_SPI_NOR)
+#ifdef CONFIG_DM_MTD_SPI_NOR
 	struct udevice *new, *bus_dev;
 	int ret;
 #else

@@ -118,7 +118,7 @@ static int do_spi_flash_probe(int argc, char * const argv[])
 			return -1;
 	}
 
-#if defined(CONFIG_DM_SPI_FLASH) || defined (CONFIG_DM_MTD_SPI_NOR)
+#ifdef CONFIG_DM_MTD_SPI_NOR
 	/* Remove the old device, otherwise probe will just be a nop */
 	ret = spi_find_bus_and_cs(bus, cs, &bus_dev, &new);
 	if (!ret) {

common/env_sf.c +2 -2

index 962cac4..a3decbe 100644
@@ -52,7 +52,7 @@ int saveenv(void)
 	char	*saved_buffer = NULL, flag = OBSOLETE_FLAG;
 	u32	saved_size, saved_offset, sector = 1;
 	int	ret;
-#if defined(CONFIG_DM_SPI_FLASH) || defined (CONFIG_DM_MTD_SPI_NOR)
+#ifdef CONFIG_DM_MTD_SPI_NOR
 	struct udevice *new;
 
 	ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,

@@ -242,7 +242,7 @@ int saveenv(void)
 	char	*saved_buffer = NULL;
 	int	ret = 1;
 	env_t	env_new;
-#if defined(CONFIG_DM_SPI_FLASH) || defined (CONFIG_DM_MTD_SPI_NOR)
+#ifdef CONFIG_DM_MTD_SPI_NOR
 	struct udevice *new;
 
 	ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,

drivers/Makefile +0 -1

index 1d179b9..c3bc3c5 100644
@@ -19,7 +19,6 @@ obj-$(CONFIG_ARMADA_XP) += ddr/marvell/axp/
 obj-$(CONFIG_ALTERA_SDRAM) += ddr/altera/
 obj-$(CONFIG_SPL_SERIAL_SUPPORT) += serial/
 obj-$(CONFIG_SPL_SPI_NOR_SUPPORT) += mtd/spi-nor/
-obj-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += mtd/spi/
 obj-$(CONFIG_SPL_SPI_SUPPORT) += spi/
 obj-$(CONFIG_SPL_POWER_SUPPORT) += power/ power/pmic/
 obj-$(CONFIG_SPL_POWER_SUPPORT) += power/regulator/

drivers/mtd/Kconfig +0 -2

index 2c8846b..99b821a 100644
@@ -32,6 +32,4 @@ endmenu
 
 source "drivers/mtd/nand/Kconfig"
 
-source "drivers/mtd/spi/Kconfig"
-
 source "drivers/mtd/spi-nor/Kconfig"

drivers/mtd/spi/Kconfig deleted +0 ~~-131~~

131 lines not on this page · raw message

drivers/mtd/spi/Makefile deleted +0 ~~-18~~

deleted file mode 100644
index c665836..0000000
@@ -1,18 +0,0 @@
-#
-# (C) Copyright 2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-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
-endif
-
-obj-$(CONFIG_SPI_FLASH) += sf_probe.o spi_flash.o sf_params.o sf.o
-obj-$(CONFIG_SPI_FLASH_DATAFLASH) += sf_dataflash.o
-obj-$(CONFIG_SPI_FLASH_MTD) += sf_mtd.o
-obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o

drivers/mtd/spi/fsl_espi_spl.c deleted +0 ~~-90~~

90 lines not on this page · raw message

drivers/mtd/spi/sandbox.c deleted +0 ~~-697~~

697 lines not on this page · raw message

drivers/mtd/spi/sf-uclass.c deleted +0 ~~-103~~

103 lines not on this page · raw message

drivers/mtd/spi/sf.c deleted +0 ~~-58~~

58 lines not on this page · raw message

drivers/mtd/spi/sf_dataflash.c deleted +0 ~~-701~~

701 lines not on this page · raw message

drivers/mtd/spi/sf_internal.h deleted +0 ~~-243~~

243 lines not on this page · raw message

drivers/mtd/spi/sf_mtd.c deleted +0 ~~-104~~

104 lines not on this page · raw message

drivers/mtd/spi/sf_params.c deleted +0 ~~-146~~

146 lines not on this page · raw message

drivers/mtd/spi/sf_probe.c deleted +0 ~~-181~~

181 lines not on this page · raw message

drivers/mtd/spi/spi_flash.c deleted +0 ~~-1182~~

469 lines not on this page · raw message

drivers/mtd/spi/spi_spl_load.c deleted +0 ~~-90~~

90 lines not on this page · raw message

include/spi_flash.h +2 ~~-223~~

225 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line

1.9.1

Part of the diff is not shown here. View the raw message.