]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
mtd: move NAND files into a raw/ subdirectory
authorMiquel Raynal <miquel.raynal@bootlin.com>
Thu, 16 Aug 2018 15:30:07 +0000 (17:30 +0200)
committerJagan Teki <jagan@amarulasolutions.com>
Thu, 20 Sep 2018 14:40:49 +0000 (20:10 +0530)
NAND flavors, like serial and parallel, have a lot in common and would
benefit to share code. Let's move raw (parallel) NAND specific code in a
raw/ subdirectory, to ease the addition of a core file in nand/ and the
introduction of a spi/ subdirectory specific to SPI NANDs.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
66 files changed:
MAINTAINERS
Makefile
README
arch/arm/mach-uniphier/board_late_init.c
common/spl/Kconfig
common/spl/spl_spi.c
doc/README.SPL
doc/README.arm-relocation
doc/README.nand
doc/README.zynq
drivers/Makefile
drivers/mtd/Makefile
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile
drivers/mtd/nand/raw/Kconfig [new file with mode: 0644]
drivers/mtd/nand/raw/Makefile [new file with mode: 0644]
drivers/mtd/nand/raw/am335x_spl_bch.c [moved from drivers/mtd/nand/am335x_spl_bch.c with 100% similarity]
drivers/mtd/nand/raw/arasan_nfc.c [moved from drivers/mtd/nand/arasan_nfc.c with 100% similarity]
drivers/mtd/nand/raw/atmel_nand.c [moved from drivers/mtd/nand/atmel_nand.c with 100% similarity]
drivers/mtd/nand/raw/atmel_nand_ecc.h [moved from drivers/mtd/nand/atmel_nand_ecc.h with 100% similarity]
drivers/mtd/nand/raw/davinci_nand.c [moved from drivers/mtd/nand/davinci_nand.c with 99% similarity]
drivers/mtd/nand/raw/denali.c [moved from drivers/mtd/nand/denali.c with 100% similarity]
drivers/mtd/nand/raw/denali.h [moved from drivers/mtd/nand/denali.h with 100% similarity]
drivers/mtd/nand/raw/denali_dt.c [moved from drivers/mtd/nand/denali_dt.c with 100% similarity]
drivers/mtd/nand/raw/denali_spl.c [moved from drivers/mtd/nand/denali_spl.c with 100% similarity]
drivers/mtd/nand/raw/fsl_elbc_nand.c [moved from drivers/mtd/nand/fsl_elbc_nand.c with 100% similarity]
drivers/mtd/nand/raw/fsl_elbc_spl.c [moved from drivers/mtd/nand/fsl_elbc_spl.c with 100% similarity]
drivers/mtd/nand/raw/fsl_ifc_nand.c [moved from drivers/mtd/nand/fsl_ifc_nand.c with 100% similarity]
drivers/mtd/nand/raw/fsl_ifc_spl.c [moved from drivers/mtd/nand/fsl_ifc_spl.c with 100% similarity]
drivers/mtd/nand/raw/fsl_upm.c [moved from drivers/mtd/nand/fsl_upm.c with 100% similarity]
drivers/mtd/nand/raw/fsmc_nand.c [moved from drivers/mtd/nand/fsmc_nand.c with 100% similarity]
drivers/mtd/nand/raw/kb9202_nand.c [moved from drivers/mtd/nand/kb9202_nand.c with 100% similarity]
drivers/mtd/nand/raw/kirkwood_nand.c [moved from drivers/mtd/nand/kirkwood_nand.c with 100% similarity]
drivers/mtd/nand/raw/kmeter1_nand.c [moved from drivers/mtd/nand/kmeter1_nand.c with 100% similarity]
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c [moved from drivers/mtd/nand/lpc32xx_nand_mlc.c with 100% similarity]
drivers/mtd/nand/raw/lpc32xx_nand_slc.c [moved from drivers/mtd/nand/lpc32xx_nand_slc.c with 100% similarity]
drivers/mtd/nand/raw/mxc_nand.c [moved from drivers/mtd/nand/mxc_nand.c with 100% similarity]
drivers/mtd/nand/raw/mxc_nand.h [moved from drivers/mtd/nand/mxc_nand.h with 100% similarity]
drivers/mtd/nand/raw/mxc_nand_spl.c [moved from drivers/mtd/nand/mxc_nand_spl.c with 100% similarity]
drivers/mtd/nand/raw/mxs_nand.c [moved from drivers/mtd/nand/mxs_nand.c with 100% similarity]
drivers/mtd/nand/raw/mxs_nand.h [moved from drivers/mtd/nand/mxs_nand.h with 100% similarity]
drivers/mtd/nand/raw/mxs_nand_dt.c [moved from drivers/mtd/nand/mxs_nand_dt.c with 100% similarity]
drivers/mtd/nand/raw/mxs_nand_spl.c [moved from drivers/mtd/nand/mxs_nand_spl.c with 100% similarity]
drivers/mtd/nand/raw/nand.c [moved from drivers/mtd/nand/nand.c with 100% similarity]
drivers/mtd/nand/raw/nand_base.c [moved from drivers/mtd/nand/nand_base.c with 100% similarity]
drivers/mtd/nand/raw/nand_bbt.c [moved from drivers/mtd/nand/nand_bbt.c with 100% similarity]
drivers/mtd/nand/raw/nand_bch.c [moved from drivers/mtd/nand/nand_bch.c with 100% similarity]
drivers/mtd/nand/raw/nand_ecc.c [moved from drivers/mtd/nand/nand_ecc.c with 99% similarity]
drivers/mtd/nand/raw/nand_ids.c [moved from drivers/mtd/nand/nand_ids.c with 100% similarity]
drivers/mtd/nand/raw/nand_plat.c [moved from drivers/mtd/nand/nand_plat.c with 100% similarity]
drivers/mtd/nand/raw/nand_spl_load.c [moved from drivers/mtd/nand/nand_spl_load.c with 100% similarity]
drivers/mtd/nand/raw/nand_spl_loaders.c [moved from drivers/mtd/nand/nand_spl_loaders.c with 100% similarity]
drivers/mtd/nand/raw/nand_spl_simple.c [moved from drivers/mtd/nand/nand_spl_simple.c with 100% similarity]
drivers/mtd/nand/raw/nand_timings.c [moved from drivers/mtd/nand/nand_timings.c with 100% similarity]
drivers/mtd/nand/raw/nand_util.c [moved from drivers/mtd/nand/nand_util.c with 99% similarity]
drivers/mtd/nand/raw/omap_elm.c [moved from drivers/mtd/nand/omap_elm.c with 100% similarity]
drivers/mtd/nand/raw/omap_gpmc.c [moved from drivers/mtd/nand/omap_gpmc.c with 100% similarity]
drivers/mtd/nand/raw/pxa3xx_nand.c [moved from drivers/mtd/nand/pxa3xx_nand.c with 99% similarity]
drivers/mtd/nand/raw/pxa3xx_nand.h [moved from drivers/mtd/nand/pxa3xx_nand.h with 100% similarity]
drivers/mtd/nand/raw/sunxi_nand.c [moved from drivers/mtd/nand/sunxi_nand.c with 100% similarity]
drivers/mtd/nand/raw/sunxi_nand_spl.c [moved from drivers/mtd/nand/sunxi_nand_spl.c with 100% similarity]
drivers/mtd/nand/raw/tegra_nand.c [moved from drivers/mtd/nand/tegra_nand.c with 100% similarity]
drivers/mtd/nand/raw/tegra_nand.h [moved from drivers/mtd/nand/tegra_nand.h with 100% similarity]
drivers/mtd/nand/raw/vf610_nfc.c [moved from drivers/mtd/nand/vf610_nfc.c with 100% similarity]
drivers/mtd/nand/raw/zynq_nand.c [moved from drivers/mtd/nand/zynq_nand.c with 100% similarity]
include/configs/MPC8313ERDB.h

index 64fb41ece7c0a24df9dbb9f45c95fa181e8b063c..20a0a5e12bc9395153456e3f24f75f0e8e93bb63 100644 (file)
@@ -298,7 +298,7 @@ F:  drivers/i2c/i2c-cdns.c
 F:     drivers/i2c/muxes/pca954x.c
 F:     drivers/i2c/zynq_i2c.c
 F:     drivers/mmc/zynq_sdhci.c
-F:     drivers/mtd/nand/zynq_nand.c
+F:     drivers/mtd/nand/raw/zynq_nand.c
 F:     drivers/net/phy/xilinx_phy.c
 F:     drivers/net/zynq_gem.c
 F:     drivers/serial/serial_zynq.c
@@ -322,7 +322,7 @@ F:  drivers/i2c/i2c-cdns.c
 F:     drivers/i2c/muxes/pca954x.c
 F:     drivers/i2c/zynq_i2c.c
 F:     drivers/mmc/zynq_sdhci.c
-F:     drivers/mtd/nand/zynq_nand.c
+F:     drivers/mtd/nand/raw/zynq_nand.c
 F:     drivers/net/phy/xilinx_phy.c
 F:     drivers/net/zynq_gem.c
 F:     drivers/serial/serial_zynq.c
@@ -467,7 +467,7 @@ NAND FLASH
 #M:    Scott Wood <oss@buserror.net>
 S:     Orphaned (Since 2018-07)
 T:     git git://git.denx.de/u-boot-nand-flash.git
-F:     drivers/mtd/nand/
+F:     drivers/mtd/nand/raw/
 
 NDS32
 M:     Macpaul Lin <macpaul@andestech.com>
index e38966edbaa75701f84e25040e47a0a00a61178d..807e803f996dcc53d87e60735833e5c95d2211b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -689,7 +689,7 @@ libs-y += drivers/dma/
 libs-y += drivers/gpio/
 libs-y += drivers/i2c/
 libs-y += drivers/mtd/
-libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/
+libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/raw/
 libs-y += drivers/mtd/onenand/
 libs-$(CONFIG_CMD_UBI) += drivers/mtd/ubi/
 libs-y += drivers/mtd/spi/
diff --git a/README b/README
index 09822a317da8da4e71f8af460b1d305af4bcd9cd..35305a61a3aa314d2871075c32c65927afb9dfa5 100644 (file)
--- a/README
+++ b/README
@@ -3256,8 +3256,8 @@ Low Level (hardware related) configuration options:
                a 16 bit bus.
                Not all NAND drivers use this symbol.
                Example of drivers that use it:
-               - drivers/mtd/nand/ndfc.c
-               - drivers/mtd/nand/mxc_nand.c
+               - drivers/mtd/nand/raw/ndfc.c
+               - drivers/mtd/nand/raw/mxc_nand.c
 
 - CONFIG_SYS_NDFC_EBC0_CFG
                Sets the EBC0_CFG register for the NDFC. If not defined
@@ -3374,7 +3374,7 @@ Low Level (hardware related) configuration options:
 - CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
                Option to disable subpage write in NAND driver
                driver that uses this:
-               drivers/mtd/nand/davinci_nand.c
+               drivers/mtd/nand/raw/davinci_nand.c
 
 Freescale QE/FMAN Firmware Support:
 -----------------------------------
index 8ffb9a8d3c2c05683d2537f402025e522009c7c4..1b871c62ced280acf0fe0f4730a38595e3c9f296 100644 (file)
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <linux/io.h>
 #include <linux/printk.h>
-#include <../drivers/mtd/nand/denali.h>
+#include <../drivers/mtd/nand/raw/denali.h>
 
 #include "init.h"
 
index 280496fbe0b6a975ecd084358a2c9c915475f0e8..18dbc238bf6f3803c2a7c553c8523943514bc74e 100644 (file)
@@ -487,7 +487,7 @@ config SPL_NAND_SUPPORT
        help
          Enable support for NAND (Negative AND) flash in SPL. NAND flash
          can be used to allow SPL to load U-Boot from supported devices.
-         This enables the drivers in drivers/mtd/nand as part of an SPL
+         This enables the drivers in drivers/mtd/nand/raw as part of an SPL
          build.
 
 config SPL_NET_SUPPORT
index ba60a3a3c5053d07b026d3aeb96914faa6dbf111..0016d497390595b5237a3b8af96f671f3da32689 100644 (file)
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2011 OMICRON electronics GmbH
  *
- * based on drivers/mtd/nand/nand_spl_load.c
+ * based on drivers/mtd/nand/raw/nand_spl_load.c
  *
  * Copyright (C) 2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
index 3ba313caa8f73feec3fd0664447f99d3a55664af..fc1ca1ad4f5124d3c06bd05e8bc54c484c577fd5 100644 (file)
@@ -57,11 +57,11 @@ CONFIG_SPL_FAT_SUPPORT (fs/fat/libfat.o)
 CONFIG_SPL_EXT_SUPPORT
 CONFIG_SPL_LIBGENERIC_SUPPORT (lib/libgeneric.o)
 CONFIG_SPL_POWER_SUPPORT (drivers/power/libpower.o)
-CONFIG_SPL_NAND_SUPPORT (drivers/mtd/nand/libnand.o)
+CONFIG_SPL_NAND_SUPPORT (drivers/mtd/nand/raw/libnand.o)
 CONFIG_SPL_DRIVERS_MISC_SUPPORT (drivers/misc)
 CONFIG_SPL_DMA_SUPPORT (drivers/dma/libdma.o)
 CONFIG_SPL_POST_MEM_SUPPORT (post/drivers/memory.o)
-CONFIG_SPL_NAND_LOAD (drivers/mtd/nand/nand_spl_load.o)
+CONFIG_SPL_NAND_LOAD (drivers/mtd/nand/raw/nand_spl_load.o)
 CONFIG_SPL_SPI_LOAD (drivers/mtd/spi/spi_spl_load.o)
 CONFIG_SPL_RAM_DEVICE (common/spl/spl.c)
 CONFIG_SPL_WATCHDOG_SUPPORT (drivers/watchdog/libwatchdog.o)
index 645b3746c8a88fe25f7c9a33cd9b8b17aa7b5a57..d2a7e8122e90edce005eb5abf0e6afc1928eda56 100644 (file)
@@ -84,7 +84,7 @@ Relocation with SPL (example for the tx25 booting from NAND Flash):
 - cpu copies the first page from NAND to 0xbb000000 (IMX_NFC_BASE)
   and start with code execution on this address.
 
-- The First page contains u-boot code from drivers/mtd/nand/mxc_nand_spl.c
+- The First page contains u-boot code from drivers/mtd/nand/raw/mxc_nand_spl.c
   which inits the dram, cpu registers, reloacte itself to CONFIG_SPL_TEXT_BASE and loads
   the "real" u-boot to CONFIG_SYS_NAND_U_BOOT_DST and starts execution
   @CONFIG_SYS_NAND_U_BOOT_START
index cda11b43ffc59fa3f04614165f67d733121541ae..ec461b2dc933b315a971607ee24a14e03a35e024 100644 (file)
@@ -116,7 +116,7 @@ Configuration Options:
       The maximum number of NAND chips per device to be supported.
 
    CONFIG_SYS_NAND_SELF_INIT
-      Traditionally, glue code in drivers/mtd/nand/nand.c has driven
+      Traditionally, glue code in drivers/mtd/nand/raw/nand.c has driven
       the initialization process -- it provides the mtd and nand
       structs, calls a board init function for a specific device,
       calls nand_scan(), and registers with mtd.
@@ -125,7 +125,7 @@ Configuration Options:
       run code between nand_scan_ident() and nand_scan_tail(), or other
       deviations from the "normal" flow.
 
-      If a board defines CONFIG_SYS_NAND_SELF_INIT, drivers/mtd/nand/nand.c
+      If a board defines CONFIG_SYS_NAND_SELF_INIT, drivers/mtd/nand/raw/nand.c
       will make one call to board_nand_init(), with no arguments.  That
       function is responsible for calling a driver init function for
       each NAND device on the board, that performs all initialization
@@ -280,7 +280,7 @@ NOTE:
 =====
 
 The Disk On Chip driver is currently broken and has been for some time.
-There is a driver in drivers/mtd/nand, taken from Linux, that works with
+There is a driver in drivers/mtd/nand/raw, taken from Linux, that works with
 the current NAND system but has not yet been adapted to the u-boot
 environment.
 
index 5b0672c50359d95e0cd18a7630bdb8456d097cb6..da977b2016a6c14b4ca4510382cc2cafb2e59dd2 100644 (file)
@@ -63,7 +63,7 @@ bootmode strings at runtime.
   spi - drivers/spi/zynq_spi.c
   qspi - drivers/spi/zynq_qspi.c
   i2c - drivers/i2c/zynq_i2c.c
-  nand - drivers/mtd/nand/zynq_nand.c
+  nand - drivers/mtd/nand/raw/zynq_nand.c
 - Done proper cleanups on board configurations
 - Added basic FDT support for zynq boards
 - d-cache support for zynq_gem.c
index 23ea609b094f519f88fddbfb178b69b26417cff1..fe8d40dddb0106a29f595cc55875f3805816fe06 100644 (file)
@@ -6,7 +6,7 @@ obj-$(CONFIG_$(SPL_TPL_)DRIVERS_MISC_SUPPORT) += misc/ sysreset/ firmware/
 obj-$(CONFIG_$(SPL_TPL_)I2C_SUPPORT) += i2c/
 obj-$(CONFIG_$(SPL_TPL_)LED) += led/
 obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += mmc/
-obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) += mtd/nand/
+obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) += mtd/nand/raw/
 obj-$(CONFIG_$(SPL_TPL_)PHY) += phy/
 obj-$(CONFIG_$(SPL_TPL_)PINCTRL) += pinctrl/
 obj-$(CONFIG_$(SPL_TPL_)RAM) += ram/
index 9cec06510c3eb47330fc75b14866b2e9415f5074..cdf515256a0fcd12fbcfc48bb7ecd00e1642d7bb 100644 (file)
@@ -18,3 +18,5 @@ obj-$(CONFIG_FLASH_PIC32) += pic32_flash.o
 obj-$(CONFIG_ST_SMI) += st_smi.o
 obj-$(CONFIG_STM32_FLASH) += stm32_flash.o
 obj-$(CONFIG_RENESAS_RPC_HF) += renesas_rpc_hf.o
+
+obj-y += nand/
index 1e4ea7bdd4d00772848ffcffffa9c71535c08f6b..6d5373471809d93885c6ac622a4ba556a0f1c563 100644 (file)
@@ -1,297 +1 @@
-
-menuconfig NAND
-       bool "NAND Device Support"
-if NAND
-
-config SYS_NAND_SELF_INIT
-       bool
-       help
-         This option, if enabled, provides more flexible and linux-like
-         NAND initialization process.
-
-config NAND_ATMEL
-       bool "Support Atmel NAND controller"
-       imply SYS_NAND_USE_FLASH_BBT
-       help
-         Enable this driver for NAND flash platforms using an Atmel NAND
-         controller.
-
-config NAND_DAVINCI
-       bool "Support TI Davinci NAND controller"
-       help
-         Enable this driver for NAND flash controllers available in TI Davinci
-         and Keystone2 platforms
-
-config NAND_DENALI
-       bool
-       select SYS_NAND_SELF_INIT
-       imply CMD_NAND
-
-config NAND_DENALI_DT
-       bool "Support Denali NAND controller as a DT device"
-       select NAND_DENALI
-       depends on OF_CONTROL && DM
-       help
-         Enable the driver for NAND flash on platforms using a Denali NAND
-         controller as a DT device.
-
-config NAND_DENALI_SPARE_AREA_SKIP_BYTES
-       int "Number of bytes skipped in OOB area"
-       depends on NAND_DENALI
-       range 0 63
-       help
-         This option specifies the number of bytes to skip from the beginning
-         of OOB area before last ECC sector data starts.  This is potentially
-         used to preserve the bad block marker in the OOB area.
-
-config NAND_LPC32XX_SLC
-       bool "Support LPC32XX_SLC controller"
-       help
-         Enable the LPC32XX SLC NAND controller.
-
-config NAND_OMAP_GPMC
-       bool "Support OMAP GPMC NAND controller"
-       depends on ARCH_OMAP2PLUS
-       help
-         Enables omap_gpmc.c driver for OMAPx and AMxxxx platforms.
-         GPMC controller is used for parallel NAND flash devices, and can
-         do ECC calculation (not ECC error detection) for HAM1, BCH4, BCH8
-         and BCH16 ECC algorithms.
-
-config NAND_OMAP_GPMC_PREFETCH
-       bool "Enable GPMC Prefetch"
-       depends on NAND_OMAP_GPMC
-       default y
-       help
-         On OMAP platforms that use the GPMC controller
-         (CONFIG_NAND_OMAP_GPMC_PREFETCH), this options enables the code that
-         uses the prefetch mode to speed up read operations.
-
-config NAND_OMAP_ELM
-       bool "Enable ELM driver for OMAPxx and AMxx platforms."
-       depends on NAND_OMAP_GPMC && !OMAP34XX
-       help
-         ELM controller is used for ECC error detection (not ECC calculation)
-         of BCH4, BCH8 and BCH16 ECC algorithms.
-         Some legacy platforms like OMAP3xx do not have in-built ELM h/w engine,
-         thus such SoC platforms need to depend on software library for ECC error
-         detection. However ECC calculation on such plaforms would still be
-         done by GPMC controller.
-
-config NAND_VF610_NFC
-       bool "Support for Freescale NFC for VF610"
-       select SYS_NAND_SELF_INIT
-       imply CMD_NAND
-       help
-         Enables support for NAND Flash Controller on some Freescale
-         processors like the VF610, MCF54418 or Kinetis K70.
-         The driver supports a maximum 2k page size. The driver
-         currently does not support hardware ECC.
-
-choice
-       prompt "Hardware ECC strength"
-       depends on NAND_VF610_NFC
-       default SYS_NAND_VF610_NFC_45_ECC_BYTES
-       help
-         Select the ECC strength used in the hardware BCH ECC block.
-
-config SYS_NAND_VF610_NFC_45_ECC_BYTES
-       bool "24-error correction (45 ECC bytes)"
-
-config SYS_NAND_VF610_NFC_60_ECC_BYTES
-       bool "32-error correction (60 ECC bytes)"
-
-endchoice
-
-config NAND_PXA3XX
-       bool "Support for NAND on PXA3xx and Armada 370/XP/38x"
-       select SYS_NAND_SELF_INIT
-       imply CMD_NAND
-       help
-         This enables the driver for the NAND flash device found on
-         PXA3xx processors (NFCv1) and also on Armada 370/XP (NFCv2).
-
-config NAND_SUNXI
-       bool "Support for NAND on Allwinner SoCs"
-       default ARCH_SUNXI
-       depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUN8I
-       select SYS_NAND_SELF_INIT
-       select SYS_NAND_U_BOOT_LOCATIONS
-       select SPL_NAND_SUPPORT
-       imply CMD_NAND
-       ---help---
-       Enable support for NAND. This option enables the standard and
-       SPL drivers.
-       The SPL driver only supports reading from the NAND using DMA
-       transfers.
-
-if NAND_SUNXI
-
-config NAND_SUNXI_SPL_ECC_STRENGTH
-       int "Allwinner NAND SPL ECC Strength"
-       default 64
-
-config NAND_SUNXI_SPL_ECC_SIZE
-       int "Allwinner NAND SPL ECC Step Size"
-       default 1024
-
-config NAND_SUNXI_SPL_USABLE_PAGE_SIZE
-       int "Allwinner NAND SPL Usable Page Size"
-       default 1024
-
-endif
-
-config NAND_ARASAN
-       bool "Configure Arasan Nand"
-       select SYS_NAND_SELF_INIT
-       imply CMD_NAND
-       help
-         This enables Nand driver support for Arasan nand flash
-         controller. This uses the hardware ECC for read and
-         write operations.
-
-config NAND_MXC
-       bool "MXC NAND support"
-       depends on CPU_ARM926EJS || CPU_ARM1136 || MX5
-       imply CMD_NAND
-       help
-         This enables the NAND driver for the NAND flash controller on the
-         i.MX27 / i.MX31 / i.MX5 rocessors.
-
-config NAND_MXS
-       bool "MXS NAND support"
-       depends on MX23 || MX28 || MX6 || MX7
-       select SYS_NAND_SELF_INIT
-       imply CMD_NAND
-       select APBH_DMA
-       select APBH_DMA_BURST if ARCH_MX6 || ARCH_MX7
-       select APBH_DMA_BURST8 if ARCH_MX6 || ARCH_MX7
-       help
-         This enables NAND driver for the NAND flash controller on the
-         MXS processors.
-
-if NAND_MXS
-
-config NAND_MXS_DT
-       bool "Support MXS NAND controller as a DT device"
-       depends on OF_CONTROL && MTD
-       help
-         Enable the driver for MXS NAND flash on platforms using
-         device tree.
-
-config NAND_MXS_USE_MINIMUM_ECC
-       bool "Use minimum ECC strength supported by the controller"
-       default false
-
-endif
-
-config NAND_ZYNQ
-       bool "Support for Zynq Nand controller"
-       select SYS_NAND_SELF_INIT
-       imply CMD_NAND
-       help
-         This enables Nand driver support for Nand flash controller
-         found on Zynq SoC.
-
-config NAND_ZYNQ_USE_BOOTLOADER1_TIMINGS
-       bool "Enable use of 1st stage bootloader timing for NAND"
-       depends on NAND_ZYNQ
-       help
-         This flag prevent U-boot reconfigure NAND flash controller and reuse
-         the NAND timing from 1st stage bootloader.
-
-comment "Generic NAND options"
-
-config SYS_NAND_BLOCK_SIZE
-       hex "NAND chip eraseblock size"
-       depends on ARCH_SUNXI
-       help
-         Number of data bytes in one eraseblock for the NAND chip on the
-         board. This is the multiple of NAND_PAGE_SIZE and the number of
-         pages.
-
-config SYS_NAND_PAGE_SIZE
-       hex "NAND chip page size"
-       depends on ARCH_SUNXI
-       help
-         Number of data bytes in one page for the NAND chip on the
-         board, not including the OOB area.
-
-config SYS_NAND_OOBSIZE
-       hex "NAND chip OOB size"
-       depends on ARCH_SUNXI
-       help
-         Number of bytes in the Out-Of-Band area for the NAND chip on
-         the board.
-
-# Enhance depends when converting drivers to Kconfig which use this config
-# option (mxc_nand, ndfc, omap_gpmc).
-config SYS_NAND_BUSWIDTH_16BIT
-       bool "Use 16-bit NAND interface"
-       depends on NAND_VF610_NFC || NAND_OMAP_GPMC || NAND_MXC || ARCH_DAVINCI
-       help
-         Indicates that NAND device has 16-bit wide data-bus. In absence of this
-         config, bus-width of NAND device is assumed to be either 8-bit and later
-         determined by reading ONFI params.
-         Above config is useful when NAND device's bus-width information cannot
-         be determined from on-chip ONFI params, like in following scenarios:
-         - SPL boot does not support reading of ONFI parameters. This is done to
-           keep SPL code foot-print small.
-         - In current U-Boot flow using nand_init(), driver initialization
-           happens in board_nand_init() which is called before any device probe
-           (nand_scan_ident + nand_scan_tail), thus device's ONFI parameters are
-           not available while configuring controller. So a static CONFIG_NAND_xx
-           is needed to know the device's bus-width in advance.
-
-if SPL
-
-config SYS_NAND_U_BOOT_LOCATIONS
-       bool "Define U-boot binaries locations in NAND"
-       help
-       Enable CONFIG_SYS_NAND_U_BOOT_OFFS though Kconfig.
-       This option should not be enabled when compiling U-boot for boards
-       defining CONFIG_SYS_NAND_U_BOOT_OFFS in their include/configs/<board>.h
-       file.
-
-config SYS_NAND_U_BOOT_OFFS
-       hex "Location in NAND to read U-Boot from"
-       default 0x800000 if NAND_SUNXI
-       depends on SYS_NAND_U_BOOT_LOCATIONS
-       help
-       Set the offset from the start of the nand where u-boot should be
-       loaded from.
-
-config SYS_NAND_U_BOOT_OFFS_REDUND
-       hex "Location in NAND to read U-Boot from"
-       default SYS_NAND_U_BOOT_OFFS
-       depends on SYS_NAND_U_BOOT_LOCATIONS
-       help
-       Set the offset from the start of the nand where the redundant u-boot
-       should be loaded from.
-
-config SPL_NAND_AM33XX_BCH
-       bool "Enables SPL-NAND driver which supports ELM based"
-       depends on NAND_OMAP_GPMC && !OMAP34XX
-       default y
-        help
-         Hardware ECC correction. This is useful for platforms which have ELM
-         hardware engine and use NAND boot mode.
-         Some legacy platforms like OMAP3xx do not have in-built ELM h/w engine,
-         so those platforms should use CONFIG_SPL_NAND_SIMPLE for enabling
-          SPL-NAND driver with software ECC correction support.
-
-config SPL_NAND_DENALI
-       bool "Support Denali NAND controller for SPL"
-       help
-         This is a small implementation of the Denali NAND controller
-         for use on SPL.
-
-config SPL_NAND_SIMPLE
-       bool "Use simple SPL NAND driver"
-       depends on !SPL_NAND_AM33XX_BCH
-       help
-         Support for NAND boot using simple NAND drivers that
-         expose the cmd_ctrl() interface.
-endif
-
-endif   # if NAND
+source "drivers/mtd/nand/raw/Kconfig"
index c61e3f38391aeb9027fd1599805d91e88c7eb2a9..69f40d15635d3a236d88140a21821e7a902e1968 100644 (file)
@@ -1,77 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-ifdef CONFIG_SPL_BUILD
-
-ifdef CONFIG_SPL_NAND_DRIVERS
-NORMAL_DRIVERS=y
-endif
-
-obj-$(CONFIG_SPL_NAND_AM33XX_BCH) += am335x_spl_bch.o
-obj-$(CONFIG_SPL_NAND_DENALI) += denali_spl.o
-obj-$(CONFIG_SPL_NAND_SIMPLE) += nand_spl_simple.o
-obj-$(CONFIG_SPL_NAND_LOAD) += nand_spl_load.o
-obj-$(CONFIG_SPL_NAND_ECC) += nand_ecc.o
-obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o
-obj-$(CONFIG_SPL_NAND_IDENT) += nand_ids.o nand_timings.o
-obj-$(CONFIG_SPL_NAND_INIT) += nand.o
-ifeq ($(CONFIG_SPL_ENV_SUPPORT),y)
-obj-$(CONFIG_ENV_IS_IN_NAND) += nand_util.o
-endif
-
-else # not spl
-
-NORMAL_DRIVERS=y
-
-obj-y += nand.o
-obj-y += nand_bbt.o
-obj-y += nand_ids.o
-obj-y += nand_util.o
-obj-y += nand_ecc.o
-obj-y += nand_base.o
-obj-y += nand_timings.o
-
-endif # not spl
-
-ifdef NORMAL_DRIVERS
-
-obj-$(CONFIG_NAND_ECC_BCH) += nand_bch.o
-
-obj-$(CONFIG_NAND_ATMEL) += atmel_nand.o
-obj-$(CONFIG_NAND_ARASAN) += arasan_nfc.o
-obj-$(CONFIG_NAND_DAVINCI) += davinci_nand.o
-obj-$(CONFIG_NAND_DENALI) += denali.o
-obj-$(CONFIG_NAND_DENALI_DT) += denali_dt.o
-obj-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_nand.o
-obj-$(CONFIG_NAND_FSL_IFC) += fsl_ifc_nand.o
-obj-$(CONFIG_NAND_FSL_UPM) += fsl_upm.o
-obj-$(CONFIG_NAND_FSMC) += fsmc_nand.o
-obj-$(CONFIG_NAND_KB9202) += kb9202_nand.o
-obj-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o
-obj-$(CONFIG_NAND_KMETER1) += kmeter1_nand.o
-obj-$(CONFIG_NAND_LPC32XX_MLC) += lpc32xx_nand_mlc.o
-obj-$(CONFIG_NAND_LPC32XX_SLC) += lpc32xx_nand_slc.o
-obj-$(CONFIG_NAND_VF610_NFC) += vf610_nfc.o
-obj-$(CONFIG_NAND_MXC) += mxc_nand.o
-obj-$(CONFIG_NAND_MXS) += mxs_nand.o
-obj-$(CONFIG_NAND_MXS_DT) += mxs_nand_dt.o
-obj-$(CONFIG_NAND_PXA3XX) += pxa3xx_nand.o
-obj-$(CONFIG_NAND_SPEAR) += spr_nand.o
-obj-$(CONFIG_TEGRA_NAND) += tegra_nand.o
-obj-$(CONFIG_NAND_OMAP_GPMC) += omap_gpmc.o
-obj-$(CONFIG_NAND_OMAP_ELM) += omap_elm.o
-obj-$(CONFIG_NAND_PLAT) += nand_plat.o
-obj-$(CONFIG_NAND_SUNXI) += sunxi_nand.o
-obj-$(CONFIG_NAND_ZYNQ) += zynq_nand.o
-
-else  # minimal SPL drivers
-
-obj-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_spl.o
-obj-$(CONFIG_NAND_FSL_IFC) += fsl_ifc_spl.o
-obj-$(CONFIG_NAND_MXC) += mxc_nand_spl.o
-obj-$(CONFIG_NAND_MXS) += mxs_nand_spl.o mxs_nand.o
-obj-$(CONFIG_NAND_SUNXI) += sunxi_nand_spl.o
-
-endif # drivers
diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
new file mode 100644 (file)
index 0000000..1e4ea7b
--- /dev/null
@@ -0,0 +1,297 @@
+
+menuconfig NAND
+       bool "NAND Device Support"
+if NAND
+
+config SYS_NAND_SELF_INIT
+       bool
+       help
+         This option, if enabled, provides more flexible and linux-like
+         NAND initialization process.
+
+config NAND_ATMEL
+       bool "Support Atmel NAND controller"
+       imply SYS_NAND_USE_FLASH_BBT
+       help
+         Enable this driver for NAND flash platforms using an Atmel NAND
+         controller.
+
+config NAND_DAVINCI
+       bool "Support TI Davinci NAND controller"
+       help
+         Enable this driver for NAND flash controllers available in TI Davinci
+         and Keystone2 platforms
+
+config NAND_DENALI
+       bool
+       select SYS_NAND_SELF_INIT
+       imply CMD_NAND
+
+config NAND_DENALI_DT
+       bool "Support Denali NAND controller as a DT device"
+       select NAND_DENALI
+       depends on OF_CONTROL && DM
+       help
+         Enable the driver for NAND flash on platforms using a Denali NAND
+         controller as a DT device.
+
+config NAND_DENALI_SPARE_AREA_SKIP_BYTES
+       int "Number of bytes skipped in OOB area"
+       depends on NAND_DENALI
+       range 0 63
+       help
+         This option specifies the number of bytes to skip from the beginning
+         of OOB area before last ECC sector data starts.  This is potentially
+         used to preserve the bad block marker in the OOB area.
+
+config NAND_LPC32XX_SLC
+       bool "Support LPC32XX_SLC controller"
+       help
+         Enable the LPC32XX SLC NAND controller.
+
+config NAND_OMAP_GPMC
+       bool "Support OMAP GPMC NAND controller"
+       depends on ARCH_OMAP2PLUS
+       help
+         Enables omap_gpmc.c driver for OMAPx and AMxxxx platforms.
+         GPMC controller is used for parallel NAND flash devices, and can
+         do ECC calculation (not ECC error detection) for HAM1, BCH4, BCH8
+         and BCH16 ECC algorithms.
+
+config NAND_OMAP_GPMC_PREFETCH
+       bool "Enable GPMC Prefetch"
+       depends on NAND_OMAP_GPMC
+       default y
+       help
+         On OMAP platforms that use the GPMC controller
+         (CONFIG_NAND_OMAP_GPMC_PREFETCH), this options enables the code that
+         uses the prefetch mode to speed up read operations.
+
+config NAND_OMAP_ELM
+       bool "Enable ELM driver for OMAPxx and AMxx platforms."
+       depends on NAND_OMAP_GPMC && !OMAP34XX
+       help
+         ELM controller is used for ECC error detection (not ECC calculation)
+         of BCH4, BCH8 and BCH16 ECC algorithms.
+         Some legacy platforms like OMAP3xx do not have in-built ELM h/w engine,
+         thus such SoC platforms need to depend on software library for ECC error
+         detection. However ECC calculation on such plaforms would still be
+         done by GPMC controller.
+
+config NAND_VF610_NFC
+       bool "Support for Freescale NFC for VF610"
+       select SYS_NAND_SELF_INIT
+       imply CMD_NAND
+       help
+         Enables support for NAND Flash Controller on some Freescale
+         processors like the VF610, MCF54418 or Kinetis K70.
+         The driver supports a maximum 2k page size. The driver
+         currently does not support hardware ECC.
+
+choice
+       prompt "Hardware ECC strength"
+       depends on NAND_VF610_NFC
+       default SYS_NAND_VF610_NFC_45_ECC_BYTES
+       help
+         Select the ECC strength used in the hardware BCH ECC block.
+
+config SYS_NAND_VF610_NFC_45_ECC_BYTES
+       bool "24-error correction (45 ECC bytes)"
+
+config SYS_NAND_VF610_NFC_60_ECC_BYTES
+       bool "32-error correction (60 ECC bytes)"
+
+endchoice
+
+config NAND_PXA3XX
+       bool "Support for NAND on PXA3xx and Armada 370/XP/38x"
+       select SYS_NAND_SELF_INIT
+       imply CMD_NAND
+       help
+         This enables the driver for the NAND flash device found on
+         PXA3xx processors (NFCv1) and also on Armada 370/XP (NFCv2).
+
+config NAND_SUNXI
+       bool "Support for NAND on Allwinner SoCs"
+       default ARCH_SUNXI
+       depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUN8I
+       select SYS_NAND_SELF_INIT
+       select SYS_NAND_U_BOOT_LOCATIONS
+       select SPL_NAND_SUPPORT
+       imply CMD_NAND
+       ---help---
+       Enable support for NAND. This option enables the standard and
+       SPL drivers.
+       The SPL driver only supports reading from the NAND using DMA
+       transfers.
+
+if NAND_SUNXI
+
+config NAND_SUNXI_SPL_ECC_STRENGTH
+       int "Allwinner NAND SPL ECC Strength"
+       default 64
+
+config NAND_SUNXI_SPL_ECC_SIZE
+       int "Allwinner NAND SPL ECC Step Size"
+       default 1024
+
+config NAND_SUNXI_SPL_USABLE_PAGE_SIZE
+       int "Allwinner NAND SPL Usable Page Size"
+       default 1024
+
+endif
+
+config NAND_ARASAN
+       bool "Configure Arasan Nand"
+       select SYS_NAND_SELF_INIT
+       imply CMD_NAND
+       help
+         This enables Nand driver support for Arasan nand flash
+         controller. This uses the hardware ECC for read and
+         write operations.
+
+config NAND_MXC
+       bool "MXC NAND support"
+       depends on CPU_ARM926EJS || CPU_ARM1136 || MX5
+       imply CMD_NAND
+       help
+         This enables the NAND driver for the NAND flash controller on the
+         i.MX27 / i.MX31 / i.MX5 rocessors.
+
+config NAND_MXS
+       bool "MXS NAND support"
+       depends on MX23 || MX28 || MX6 || MX7
+       select SYS_NAND_SELF_INIT
+       imply CMD_NAND
+       select APBH_DMA
+       select APBH_DMA_BURST if ARCH_MX6 || ARCH_MX7
+       select APBH_DMA_BURST8 if ARCH_MX6 || ARCH_MX7
+       help
+         This enables NAND driver for the NAND flash controller on the
+         MXS processors.
+
+if NAND_MXS
+
+config NAND_MXS_DT
+       bool "Support MXS NAND controller as a DT device"
+       depends on OF_CONTROL && MTD
+       help
+         Enable the driver for MXS NAND flash on platforms using
+         device tree.
+
+config NAND_MXS_USE_MINIMUM_ECC
+       bool "Use minimum ECC strength supported by the controller"
+       default false
+
+endif
+
+config NAND_ZYNQ
+       bool "Support for Zynq Nand controller"
+       select SYS_NAND_SELF_INIT
+       imply CMD_NAND
+       help
+         This enables Nand driver support for Nand flash controller
+         found on Zynq SoC.
+
+config NAND_ZYNQ_USE_BOOTLOADER1_TIMINGS
+       bool "Enable use of 1st stage bootloader timing for NAND"
+       depends on NAND_ZYNQ
+       help
+         This flag prevent U-boot reconfigure NAND flash controller and reuse
+         the NAND timing from 1st stage bootloader.
+
+comment "Generic NAND options"
+
+config SYS_NAND_BLOCK_SIZE
+       hex "NAND chip eraseblock size"
+       depends on ARCH_SUNXI
+       help
+         Number of data bytes in one eraseblock for the NAND chip on the
+         board. This is the multiple of NAND_PAGE_SIZE and the number of
+         pages.
+
+config SYS_NAND_PAGE_SIZE
+       hex "NAND chip page size"
+       depends on ARCH_SUNXI
+       help
+         Number of data bytes in one page for the NAND chip on the
+         board, not including the OOB area.
+
+config SYS_NAND_OOBSIZE
+       hex "NAND chip OOB size"
+       depends on ARCH_SUNXI
+       help
+         Number of bytes in the Out-Of-Band area for the NAND chip on
+         the board.
+
+# Enhance depends when converting drivers to Kconfig which use this config
+# option (mxc_nand, ndfc, omap_gpmc).
+config SYS_NAND_BUSWIDTH_16BIT
+       bool "Use 16-bit NAND interface"
+       depends on NAND_VF610_NFC || NAND_OMAP_GPMC || NAND_MXC || ARCH_DAVINCI
+       help
+         Indicates that NAND device has 16-bit wide data-bus. In absence of this
+         config, bus-width of NAND device is assumed to be either 8-bit and later
+         determined by reading ONFI params.
+         Above config is useful when NAND device's bus-width information cannot
+         be determined from on-chip ONFI params, like in following scenarios:
+         - SPL boot does not support reading of ONFI parameters. This is done to
+           keep SPL code foot-print small.
+         - In current U-Boot flow using nand_init(), driver initialization
+           happens in board_nand_init() which is called before any device probe
+           (nand_scan_ident + nand_scan_tail), thus device's ONFI parameters are
+           not available while configuring controller. So a static CONFIG_NAND_xx
+           is needed to know the device's bus-width in advance.
+
+if SPL
+
+config SYS_NAND_U_BOOT_LOCATIONS
+       bool "Define U-boot binaries locations in NAND"
+       help
+       Enable CONFIG_SYS_NAND_U_BOOT_OFFS though Kconfig.
+       This option should not be enabled when compiling U-boot for boards
+       defining CONFIG_SYS_NAND_U_BOOT_OFFS in their include/configs/<board>.h
+       file.
+
+config SYS_NAND_U_BOOT_OFFS
+       hex "Location in NAND to read U-Boot from"
+       default 0x800000 if NAND_SUNXI
+       depends on SYS_NAND_U_BOOT_LOCATIONS
+       help
+       Set the offset from the start of the nand where u-boot should be
+       loaded from.
+
+config SYS_NAND_U_BOOT_OFFS_REDUND
+       hex "Location in NAND to read U-Boot from"
+       default SYS_NAND_U_BOOT_OFFS
+       depends on SYS_NAND_U_BOOT_LOCATIONS
+       help
+       Set the offset from the start of the nand where the redundant u-boot
+       should be loaded from.
+
+config SPL_NAND_AM33XX_BCH
+       bool "Enables SPL-NAND driver which supports ELM based"
+       depends on NAND_OMAP_GPMC && !OMAP34XX
+       default y
+        help
+         Hardware ECC correction. This is useful for platforms which have ELM
+         hardware engine and use NAND boot mode.
+         Some legacy platforms like OMAP3xx do not have in-built ELM h/w engine,
+         so those platforms should use CONFIG_SPL_NAND_SIMPLE for enabling
+          SPL-NAND driver with software ECC correction support.
+
+config SPL_NAND_DENALI
+       bool "Support Denali NAND controller for SPL"
+       help
+         This is a small implementation of the Denali NAND controller
+         for use on SPL.
+
+config SPL_NAND_SIMPLE
+       bool "Use simple SPL NAND driver"
+       depends on !SPL_NAND_AM33XX_BCH
+       help
+         Support for NAND boot using simple NAND drivers that
+         expose the cmd_ctrl() interface.
+endif
+
+endif   # if NAND
diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile
new file mode 100644 (file)
index 0000000..c61e3f3
--- /dev/null
@@ -0,0 +1,77 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# (C) Copyright 2006
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+
+ifdef CONFIG_SPL_BUILD
+
+ifdef CONFIG_SPL_NAND_DRIVERS
+NORMAL_DRIVERS=y
+endif
+
+obj-$(CONFIG_SPL_NAND_AM33XX_BCH) += am335x_spl_bch.o
+obj-$(CONFIG_SPL_NAND_DENALI) += denali_spl.o
+obj-$(CONFIG_SPL_NAND_SIMPLE) += nand_spl_simple.o
+obj-$(CONFIG_SPL_NAND_LOAD) += nand_spl_load.o
+obj-$(CONFIG_SPL_NAND_ECC) += nand_ecc.o
+obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o
+obj-$(CONFIG_SPL_NAND_IDENT) += nand_ids.o nand_timings.o
+obj-$(CONFIG_SPL_NAND_INIT) += nand.o
+ifeq ($(CONFIG_SPL_ENV_SUPPORT),y)
+obj-$(CONFIG_ENV_IS_IN_NAND) += nand_util.o
+endif
+
+else # not spl
+
+NORMAL_DRIVERS=y
+
+obj-y += nand.o
+obj-y += nand_bbt.o
+obj-y += nand_ids.o
+obj-y += nand_util.o
+obj-y += nand_ecc.o
+obj-y += nand_base.o
+obj-y += nand_timings.o
+
+endif # not spl
+
+ifdef NORMAL_DRIVERS
+
+obj-$(CONFIG_NAND_ECC_BCH) += nand_bch.o
+
+obj-$(CONFIG_NAND_ATMEL) += atmel_nand.o
+obj-$(CONFIG_NAND_ARASAN) += arasan_nfc.o
+obj-$(CONFIG_NAND_DAVINCI) += davinci_nand.o
+obj-$(CONFIG_NAND_DENALI) += denali.o
+obj-$(CONFIG_NAND_DENALI_DT) += denali_dt.o
+obj-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_nand.o
+obj-$(CONFIG_NAND_FSL_IFC) += fsl_ifc_nand.o
+obj-$(CONFIG_NAND_FSL_UPM) += fsl_upm.o
+obj-$(CONFIG_NAND_FSMC) += fsmc_nand.o
+obj-$(CONFIG_NAND_KB9202) += kb9202_nand.o
+obj-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o
+obj-$(CONFIG_NAND_KMETER1) += kmeter1_nand.o
+obj-$(CONFIG_NAND_LPC32XX_MLC) += lpc32xx_nand_mlc.o
+obj-$(CONFIG_NAND_LPC32XX_SLC) += lpc32xx_nand_slc.o
+obj-$(CONFIG_NAND_VF610_NFC) += vf610_nfc.o
+obj-$(CONFIG_NAND_MXC) += mxc_nand.o
+obj-$(CONFIG_NAND_MXS) += mxs_nand.o
+obj-$(CONFIG_NAND_MXS_DT) += mxs_nand_dt.o
+obj-$(CONFIG_NAND_PXA3XX) += pxa3xx_nand.o
+obj-$(CONFIG_NAND_SPEAR) += spr_nand.o
+obj-$(CONFIG_TEGRA_NAND) += tegra_nand.o
+obj-$(CONFIG_NAND_OMAP_GPMC) += omap_gpmc.o
+obj-$(CONFIG_NAND_OMAP_ELM) += omap_elm.o
+obj-$(CONFIG_NAND_PLAT) += nand_plat.o
+obj-$(CONFIG_NAND_SUNXI) += sunxi_nand.o
+obj-$(CONFIG_NAND_ZYNQ) += zynq_nand.o
+
+else  # minimal SPL drivers
+
+obj-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_spl.o
+obj-$(CONFIG_NAND_FSL_IFC) += fsl_ifc_spl.o
+obj-$(CONFIG_NAND_MXC) += mxc_nand_spl.o
+obj-$(CONFIG_NAND_MXS) += mxs_nand_spl.o mxs_nand.o
+obj-$(CONFIG_NAND_SUNXI) += sunxi_nand_spl.o
+
+endif # drivers
similarity index 99%
rename from drivers/mtd/nand/davinci_nand.c
rename to drivers/mtd/nand/raw/davinci_nand.c
index 305e68ad49369f5a291380a5c0fe3ded51aa799d..e6a84a52b42b5f9c1204ab3266d0b89db11e2670 100644 (file)
@@ -9,7 +9,7 @@
 
 /*
  *
- * linux/drivers/mtd/nand/nand_davinci.c
+ * linux/drivers/mtd/nand/raw/nand_davinci.c
  *
  * NAND Flash Driver
  *
similarity index 99%
rename from drivers/mtd/nand/nand_ecc.c
rename to drivers/mtd/nand/raw/nand_ecc.c
index 05e55fce9af619123a45325d5d023ad75d8ef97e..2bc329be1a3b010334aa651a588419e7ec75f67a 100644 (file)
@@ -3,7 +3,7 @@
  * This file contains an ECC algorithm from Toshiba that detects and
  * corrects 1 bit errors in a 256 byte block of data.
  *
- * drivers/mtd/nand/nand_ecc.c
+ * drivers/mtd/nand/raw/nand_ecc.c
  *
  * Copyright (C) 2000-2004 Steven J. Hill (sjhill@realitydiluted.com)
  *                         Toshiba America Electronics Components, Inc.
similarity index 99%
rename from drivers/mtd/nand/nand_util.c
rename to drivers/mtd/nand/raw/nand_util.c
index 1ded7aa9207d04486d32dd1c42a58081d82348f2..fc2235c1a0ec5d82d25797e02e979ebbc3d11b7b 100644 (file)
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * drivers/mtd/nand/nand_util.c
+ * drivers/mtd/nand/raw/nand_util.c
  *
  * Copyright (C) 2006 by Weiss-Electronic GmbH.
  * All rights reserved.
similarity index 99%
rename from drivers/mtd/nand/pxa3xx_nand.c
rename to drivers/mtd/nand/raw/pxa3xx_nand.c
index 2a02a9d58efca4e3cccd7bb37f0295e2ff37dd7b..4c783f1e1e4bc805954f078ce359f18084e0ab69 100644 (file)
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * drivers/mtd/nand/pxa3xx_nand.c
+ * drivers/mtd/nand/raw/pxa3xx_nand.c
  *
  * Copyright © 2005 Intel Corporation
  * Copyright © 2006 Marvell International Ltd.
index 884dd4125e55a481fe66132eb6c156bd268ac32d..5b5c38f2c9faaf4efe2b4380965691a7c18a080c 100644 (file)
                                /* LB refresh timer prescal, 266MHz/32 */
 #define CONFIG_SYS_LBC_MRTPR   0x20000000  /*TODO */
 
-/* drivers/mtd/nand/nand.c */
+/* drivers/mtd/nand/raw/nand.c */
 #if defined(CONFIG_NAND) && defined(CONFIG_SPL_BUILD)
 #define CONFIG_SYS_NAND_BASE           0xFFF00000
 #else