January 2018 - U-Boot

[U-Boot] [PATCH 4/5] Convert CONFIG_SPL_NAND_BASE et al to Kconfig
by Adam Ford 26 Jan '18

26 Jan '18

This converts the following to Kconfig: CONFIG_SPL_NAND_BASE CONFIG_SPL_NAND_LOAD CONFIG_SPL_NAND_SOFTECC CONFIG_SPL_NAND_RAW_ONLY Signed-off-by: Adam Ford <aford173(a)gmail.com> --- README | 6 ------ configs/am335x_baltos_defconfig | 1 + configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am335x_hs_evm_defconfig | 1 + configs/am335x_hs_evm_uart_defconfig | 1 + configs/am335x_igep003x_defconfig | 1 + configs/am3517_crane_defconfig | 1 + configs/am3517_evm_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/am43xx_hs_evm_defconfig | 1 + configs/axm_defconfig | 3 +++ configs/brppt1_nand_defconfig | 1 + configs/cairo_defconfig | 1 + configs/chiliboard_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/cm_t43_defconfig | 1 + configs/corvus_defconfig | 3 +++ configs/devkit3250_defconfig | 2 ++ configs/devkit8000_defconfig | 1 + configs/draco_defconfig | 1 + configs/eco5pk_defconfig | 2 ++ configs/etamin_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/igep00x0_defconfig | 1 + configs/ipam390_defconfig | 2 ++ configs/k2e_evm_defconfig | 1 + configs/k2g_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/mcx_defconfig | 2 ++ configs/mt_ventoux_defconfig | 2 ++ configs/omap3_beagle_defconfig | 1 + configs/omap3_evm_defconfig | 1 + configs/omap3_ha_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omapl138_lcdk_defconfig | 2 ++ configs/pengwyn_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/sama5d3_xplained_nandflash_defconfig | 1 + configs/sama5d3xek_nandflash_defconfig | 1 + configs/sama5d4_xplained_nandflash_defconfig | 1 + configs/sama5d4ek_nandflash_defconfig | 1 + configs/smartweb_defconfig | 3 +++ configs/tao3530_defconfig | 1 + configs/taurus_defconfig | 3 +++ configs/thuban_defconfig | 1 + configs/ti816x_evm_defconfig | 1 + configs/tricorder_defconfig | 1 + configs/tricorder_flash_defconfig | 1 + configs/twister_defconfig | 2 ++ configs/wb45n_defconfig | 1 + configs/wb50n_defconfig | 1 + configs/work_92105_defconfig | 1 + drivers/mtd/nand/Kconfig | 22 ++++++++++++++++++++++ include/configs/am3517_crane.h | 2 -- include/configs/am3517_evm.h | 2 -- include/configs/at91sam9m10g45ek.h | 2 -- include/configs/at91sam9n12ek.h | 3 --- include/configs/at91sam9x5ek.h | 3 --- include/configs/brppt1.h | 1 - include/configs/cm_t35.h | 2 -- include/configs/corvus.h | 3 --- include/configs/da850evm.h | 2 -- include/configs/devkit3250.h | 3 --- include/configs/ipam390.h | 2 -- include/configs/mcx.h | 3 --- include/configs/omapl138_lcdk.h | 2 -- include/configs/sama5d3_xplained.h | 3 --- include/configs/sama5d3xek.h | 3 --- include/configs/sama5d4_xplained.h | 3 --- include/configs/sama5d4ek.h | 3 --- include/configs/siemens-am33x-common.h | 1 - include/configs/smartweb.h | 3 --- include/configs/tam3517-common.h | 3 --- include/configs/tao3530.h | 2 -- include/configs/taurus.h | 3 --- include/configs/ti_armv7_common.h | 1 - include/configs/tricorder.h | 1 - include/configs/wb45n.h | 1 - include/configs/wb50n.h | 1 - include/configs/work_92105.h | 1 - scripts/config_whitelist.txt | 4 ---- 90 files changed, 97 insertions(+), 69 deletions(-) diff --git a/README b/README index a09912d..a403a4b 100644 --- a/README +++ b/README @@ -2775,8 +2775,6 @@ FIT uImage format: CONFIG_SPL_SKIP_RELOCATE Avoid SPL relocation - CONFIG_SPL_NAND_BASE - Include nand_base.c in the SPL. Requires CONFIG_SPL_NAND_DRIVERS SPL uses normal NAND drivers, not minimal drivers. @@ -2788,10 +2786,6 @@ FIT uImage format: Support for a lightweight UBI (fastmap) scanner and loader - CONFIG_SPL_NAND_RAW_ONLY - Support to boot only raw u-boot.bin images. Use this only - if you need to save space. - CONFIG_SPL_COMMON_INIT_DDR Set for common ddr init with serial presence detect in SPL binary. diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 1a971fd..19ea684 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -51,6 +51,7 @@ CONFIG_ISO_PARTITION=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 151a7ed..39a5bbe 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -35,6 +35,7 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 4f55fc0..654a9a1 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -28,6 +28,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_MTD_NOR_FLASH=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index d04c157..250d8eb 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -32,6 +32,7 @@ CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index 34ad928..bec07e9 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -44,6 +44,7 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig index d51a323..d315f97 100644 --- a/configs/am335x_hs_evm_uart_defconfig +++ b/configs/am335x_hs_evm_uart_defconfig @@ -41,6 +41,7 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index 414fd77..7b496bb 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -53,6 +53,7 @@ CONFIG_ENV_IS_IN_UBI=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index d605fb5..3d9834f 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -30,6 +30,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 5c0c8a1..658af75 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -38,6 +38,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index d9269ec..e78032d 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -35,6 +35,7 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 2ec4a83..f69ebcf 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -50,6 +50,7 @@ CONFIG_DFU_SF=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index b7d18fc..b266f65 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -58,6 +58,7 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index a94a2f1..d420957 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -46,6 +46,7 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/axm_defconfig b/configs/axm_defconfig index 23dc557..bfa696e 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -40,7 +40,10 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_SOFTECC=y +CONFIG_SPL_NAND_RAW_ONLY=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig index 3c58bf3..cf269d6 100644 --- a/configs/brppt1_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -55,6 +55,7 @@ CONFIG_NETCONSOLE=y # CONFIG_MMC is not set CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 1c83d02..3ca7063 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -41,6 +41,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig index 7d10aa9..8bf5605 100644 --- a/configs/chiliboard_defconfig +++ b/configs/chiliboard_defconfig @@ -42,6 +42,7 @@ CONFIG_DM_GPIO=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index e13accd..1e98f75 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -56,6 +56,7 @@ CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 62e7f4d..6255067 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -43,6 +43,7 @@ CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 6a24574..ccfcd5f 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index cb07e07..38a979c 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -44,7 +44,10 @@ CONFIG_DFU_NAND=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_SOFTECC=y +CONFIG_SPL_NAND_RAW_ONLY=y CONFIG_PHYLIB=y # CONFIG_SPL_DM_SERIAL is not set CONFIG_ATMEL_USART=y diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig index 7597579..bfae568 100644 --- a/configs/devkit3250_defconfig +++ b/configs/devkit3250_defconfig @@ -37,6 +37,8 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_SOFTECC=y +CONFIG_SPL_NAND_RAW_ONLY=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_PHYLIB=y CONFIG_DM_SERIAL=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index dc5c169..9527106 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -36,6 +36,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index d517b05..cec52e2 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -56,6 +56,7 @@ CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index 5477405..dac6aac 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -31,7 +31,9 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_SOFTECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index f264b94..4be4fc1 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -57,6 +57,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_MAX_NAND_DEVICE=3 CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 9d87bc3..bc97929 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -34,6 +34,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index 9d655cd..dc296ee 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_defconfig @@ -34,6 +34,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig index d39acf9..fb74d58 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -37,5 +37,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y +CONFIG_SPL_NAND_LOAD=y CONFIG_SPL_NAND_ECC=y CONFIG_SYS_NS16550=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index 6274452..06690b6 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -40,6 +40,7 @@ CONFIG_TI_AEMIF=y CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index 5e86f65..54b43b1 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -39,6 +39,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index cef43a4..b25dd7e 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -40,6 +40,7 @@ CONFIG_TI_AEMIF=y CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 3480f39..811be61 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -40,6 +40,7 @@ CONFIG_TI_AEMIF=y CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index 4868cf2..5b3a9eb 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -39,7 +39,9 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_SOFTECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 9d1bfd7..fc184d7 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -36,7 +36,9 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_SOFTECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 3c4fa4b..9624540 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -47,6 +47,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 275d27f..4092c61 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -45,6 +45,7 @@ CONFIG_MTD=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index a006527..9cdf812 100644 --- a/configs/omap3_ha_defconfig +++ b/configs/omap3_ha_defconfig @@ -30,6 +30,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index e0a7e02..39b951f 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -43,6 +43,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 80c7f80..3169704 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -46,6 +46,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 02f0bda..3e51162 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -34,6 +34,8 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000 CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y +CONFIG_SPL_NAND_LOAD=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SPI_FLASH=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 5656776..61fa055 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -58,6 +58,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 3bd223a..4973395 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -59,6 +59,7 @@ CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 207d893..edf699e 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -56,6 +56,7 @@ CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index ffd42e4..ab90081 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -60,6 +60,7 @@ CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index 07962fc..1a69ff7 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -54,6 +54,7 @@ CONFIG_GENERIC_ATMEL_MCI=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_DM_ETH=y CONFIG_MACB=y CONFIG_PINCTRL=y diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index 453183e..b59e5a9 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -55,6 +55,7 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index 2117aa8..786fd3a 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -52,6 +52,7 @@ CONFIG_GENERIC_ATMEL_MCI=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index 652a509..98103cb 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -52,6 +52,7 @@ CONFIG_GENERIC_ATMEL_MCI=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 139944d..2700a83 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -47,7 +47,10 @@ CONFIG_DFU_NAND=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_SOFTECC=y +CONFIG_SPL_NAND_RAW_ONLY=y CONFIG_PHYLIB=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index eeefb13..3e2788e 100644 --- a/configs/tao3530_defconfig +++ b/configs/tao3530_defconfig @@ -30,6 +30,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 11eec76..6a451b8 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -50,7 +50,10 @@ CONFIG_DFU_NAND=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_SOFTECC=y +CONFIG_SPL_NAND_RAW_ONLY=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index efe6389..5a6f677 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -56,6 +56,7 @@ CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index b72d47e..dd1a517 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -46,6 +46,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index 6b69568..a180945 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -39,6 +39,7 @@ CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index e5302b4..d35673e 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -38,6 +38,7 @@ CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y diff --git a/configs/twister_defconfig b/configs/twister_defconfig index 4937469..34bd769 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -36,7 +36,9 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_SOFTECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig index cff1d8c..910a33b 100644 --- a/configs/wb45n_defconfig +++ b/configs/wb45n_defconfig @@ -27,5 +27,6 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/wb50n_defconfig b/configs/wb50n_defconfig index 1a8cde8..1afa15d 100644 --- a/configs/wb50n_defconfig +++ b/configs/wb50n_defconfig @@ -26,6 +26,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig index 3a30ed9..1d2d101 100644 --- a/configs/work_92105_defconfig +++ b/configs/work_92105_defconfig @@ -36,6 +36,7 @@ CONFIG_DM_GPIO=y # CONFIG_MMC is not set CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_PHYLIB=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 9c51ddc..4424244 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -254,11 +254,33 @@ config SPL_NAND_DRIVERS help SPL uses normal NAND drivers, not minimal drivers. +config SPL_NAND_BASE + bool "Enable NAND base in SPL" + depends on SPL_NAND_DRIVERS + help + Include nand_base.c in the SPL. + +config SPL_NAND_LOAD + bool "Enable nand_spl_load" + help + This is usually only needed with some Davinci devices. + config SPL_NAND_ECC bool "Enable SPL NAND ECC" help Include standard software ECC in the SPL +config SPL_NAND_SOFTECC + bool "Use Soft ECC in SPL" + help + Use this option when a HW ECC isn't available + +config SPL_NAND_RAW_ONLY + bool "Only boot raw u-boot.bin images" + help + Support to boot only raw u-boot.bin images. Use this only + if you need to save space. + config SPL_NAND_SIMPLE bool "Use simple SPL NAND driver" depends on !SPL_NAND_AM33XX_BCH diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index d3e157a..852bc4d 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -239,8 +239,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_NAND_BASE - /* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 07686a2..91e7a55 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -227,6 +227,4 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_NAND_BASE - #endif /* __CONFIG_H */ diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 8e576d8..d7d9747 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -123,8 +123,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index dfaef8f..f4629be 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -179,9 +179,6 @@ #elif CONFIG_SPI_BOOT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400 - -#elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 04ca0e4..89a89f27 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -152,9 +152,6 @@ #elif CONFIG_SPI_BOOT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400 - -#elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 810939e..9f96c8a 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -71,7 +71,6 @@ #endif /* CONFIG_SPL_OS_BOOT */ #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 #endif /* CONFIG_NAND */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 35faa26..7e3d607 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -224,8 +224,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_NAND_BASE - /* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 49bcaf2..8cd62bb 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -122,9 +122,6 @@ #define CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_MAX_SIZE #define CONFIG_SPL_BSS_MAX_SIZE (SZ_2K) -#define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_RAW_ONLY -#define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000 #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 355d05d..7cef14d 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -204,8 +204,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 10 #define CONFIG_SYS_NAND_OOBSIZE 64 -#define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_LOAD #endif /* diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 5fce3ff..ab5417b 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -177,9 +177,6 @@ /* SPL will use serial */ /* SPL loads an image from NAND */ -#define CONFIG_SPL_NAND_RAW_ONLY - -#define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SPL_MAX_SIZE 0x20000 #define CONFIG_SPL_PAD_TO CONFIG_SPL_MAX_SIZE diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index b60b6c3..a5a3fe9 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -168,8 +168,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 10 #define CONFIG_SYS_NAND_OOBSIZE 64 -#define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_LOAD /* * Network & Ethernet Configuration diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 96985f5..3459ca1 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -259,8 +259,6 @@ /* Defines for SPL */ -#define CONFIG_SPL_NAND_BASE - #define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/ #define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */ #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK @@ -287,7 +285,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 256 #define CONFIG_SYS_NAND_ECCBYTES 3 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW -#define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index ca4e71a..07f86e1 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -184,8 +184,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 10 #define CONFIG_SYS_NAND_OOBSIZE 64 -#define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_LOAD #endif #ifdef CONFIG_SYS_USE_NOR diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index d91e75f..fdb71f6 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -80,9 +80,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" - -#elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index d5e158c..14f5364 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -104,9 +104,6 @@ #elif CONFIG_SPI_BOOT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 - -#elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 4f7d70e..b64f87a 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -63,9 +63,6 @@ #elif CONFIG_SPI_BOOT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 - -#elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #endif #define CONFIG_PMECC_CAP 8 #define CONFIG_PMECC_SECTOR_SIZE 512 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 712e64b..d64e7fc 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -60,9 +60,6 @@ #elif CONFIG_SPI_BOOT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 - -#elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #endif #define CONFIG_PMECC_CAP 8 #define CONFIG_PMECC_SECTOR_SIZE 512 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 4703fb9..32ba972 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -114,7 +114,6 @@ #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 6d82182..7d5e067 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -205,9 +205,6 @@ #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) #define CONFIG_SYS_USE_NANDFLASH 1 -#define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_RAW_ONLY -#define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_NAND_U_BOOT_SIZE SZ_512K #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 36453bc..71b0034 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -152,11 +152,8 @@ /* Defines for SPL */ #define CONFIG_SPL_CONSOLE -#define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SPL_NAND_WORKSPACE 0x8f07f000 /* below BSS */ -#define CONFIG_SPL_NAND_BASE - #define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/ #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index dc732f1..bb66526 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -210,8 +210,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_NAND_BASE - /* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index f0e8414..f8735a3 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -164,9 +164,6 @@ #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) #define CONFIG_SYS_USE_NANDFLASH 1 -#define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_RAW_ONLY -#define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_NAND_U_BOOT_SIZE SZ_512K #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index e0f67c7..db1d0aa 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -202,7 +202,6 @@ /* General parts of the framework, required. */ #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #endif #endif /* !CONFIG_NOR_BOOT */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 257e95c..b6cf498 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -231,7 +231,6 @@ /* Defines for SPL */ -#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index d2c754e..e62271c 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -144,7 +144,6 @@ #define CONFIG_SYS_MCKR 0x1301 #define CONFIG_SYS_MCKR_CSS 0x1302 -#define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_SIZE 0x800 diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h index f031d23..2ddb5f9 100644 --- a/include/configs/wb50n.h +++ b/include/configs/wb50n.h @@ -122,7 +122,6 @@ #define CONFIG_SYS_MONITOR_LEN (512 << 10) -#define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_SIZE 0x800 diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index a7e7d4f..ded503d 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -156,7 +156,6 @@ /* Use the framework and generic lib */ /* SPL will use serial */ /* SPL will load U-Boot from NAND offset 0x40000 */ -#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_BOOT #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00040000 #define CONFIG_SPL_PAD_TO 0x20000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 468f445..b55d76a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2058,13 +2058,9 @@ CONFIG_SPL_MMC_LOAD CONFIG_SPL_MMC_MINIMAL CONFIG_SPL_MPC83XX_WAIT_FOR_NAND CONFIG_SPL_MXS_PSWITCH_WAIT -CONFIG_SPL_NAND_BASE CONFIG_SPL_NAND_BOOT CONFIG_SPL_NAND_INIT -CONFIG_SPL_NAND_LOAD CONFIG_SPL_NAND_MINIMAL -CONFIG_SPL_NAND_RAW_ONLY -CONFIG_SPL_NAND_SOFTECC CONFIG_SPL_NAND_WORKSPACE CONFIG_SPL_NO_CPU_SUPPORT_CODE CONFIG_SPL_PAD_TO -- 2.7.4

2 1

[U-Boot] [PATCH 3/5] Convert CONFIG_SPL_NAND_DRIVERS et al to Kconfig
by Adam Ford 26 Jan '18

26 Jan '18

This converts the following to Kconfig: CONFIG_SPL_NAND_DRIVERS CONFIG_SPL_NAND_ECC Signed-off-by: Adam Ford <aford173(a)gmail.com> --- README | 5 ----- configs/am335x_baltos_defconfig | 2 ++ configs/am335x_evm_defconfig | 2 ++ configs/am335x_evm_nor_defconfig | 2 ++ configs/am335x_evm_usbspl_defconfig | 2 ++ configs/am335x_hs_evm_defconfig | 2 ++ configs/am335x_hs_evm_uart_defconfig | 2 ++ configs/am335x_igep003x_defconfig | 2 ++ configs/am3517_crane_defconfig | 2 ++ configs/am3517_evm_defconfig | 2 ++ configs/am43xx_evm_defconfig | 2 ++ configs/am43xx_evm_ethboot_defconfig | 2 ++ configs/am43xx_evm_usbhost_boot_defconfig | 2 ++ configs/am43xx_hs_evm_defconfig | 2 ++ configs/axm_defconfig | 2 ++ configs/brppt1_nand_defconfig | 2 ++ configs/cairo_defconfig | 2 ++ configs/chiliboard_defconfig | 2 ++ configs/cm_t335_defconfig | 2 ++ configs/cm_t35_defconfig | 2 ++ configs/cm_t43_defconfig | 2 ++ configs/corvus_defconfig | 2 ++ configs/devkit3250_defconfig | 2 ++ configs/devkit8000_defconfig | 2 ++ configs/draco_defconfig | 2 ++ configs/eco5pk_defconfig | 2 ++ configs/etamin_defconfig | 2 ++ configs/igep0032_defconfig | 2 ++ configs/igep00x0_defconfig | 2 ++ configs/ipam390_defconfig | 2 ++ configs/k2e_evm_defconfig | 2 ++ configs/k2g_evm_defconfig | 2 ++ configs/k2hk_evm_defconfig | 2 ++ configs/k2l_evm_defconfig | 2 ++ configs/mcx_defconfig | 2 ++ configs/mt_ventoux_defconfig | 2 ++ configs/omap3_beagle_defconfig | 2 ++ configs/omap3_evm_defconfig | 2 ++ configs/omap3_ha_defconfig | 2 ++ configs/omap3_logic_defconfig | 2 ++ configs/omap3_overo_defconfig | 2 ++ configs/omapl138_lcdk_defconfig | 2 ++ configs/pengwyn_defconfig | 2 ++ configs/pxm2_defconfig | 2 ++ configs/rastaban_defconfig | 2 ++ configs/rut_defconfig | 2 ++ configs/sama5d3_xplained_nandflash_defconfig | 1 + configs/sama5d3xek_nandflash_defconfig | 1 + configs/sama5d4_xplained_nandflash_defconfig | 1 + configs/sama5d4ek_nandflash_defconfig | 1 + configs/smartweb_defconfig | 2 ++ configs/tao3530_defconfig | 2 ++ configs/taurus_defconfig | 2 ++ configs/thuban_defconfig | 2 ++ configs/ti816x_evm_defconfig | 2 ++ configs/tricorder_defconfig | 2 ++ configs/tricorder_flash_defconfig | 2 ++ configs/twister_defconfig | 2 ++ configs/wb45n_defconfig | 1 + configs/wb50n_defconfig | 1 + configs/work_92105_defconfig | 1 + drivers/mtd/nand/Kconfig | 10 ++++++++++ include/configs/am3517_crane.h | 2 -- include/configs/am3517_evm.h | 2 -- include/configs/at91sam9m10g45ek.h | 2 -- include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/brppt1.h | 2 -- include/configs/cm_t35.h | 2 -- include/configs/corvus.h | 2 -- include/configs/da850evm.h | 2 -- include/configs/devkit3250.h | 2 -- include/configs/ipam390.h | 2 -- include/configs/mcx.h | 2 -- include/configs/omapl138_lcdk.h | 2 -- include/configs/sama5d3_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - include/configs/sama5d4_xplained.h | 1 - include/configs/sama5d4ek.h | 1 - include/configs/siemens-am33x-common.h | 2 -- include/configs/smartweb.h | 2 -- include/configs/tam3517-common.h | 2 -- include/configs/tao3530.h | 2 -- include/configs/taurus.h | 2 -- include/configs/ti_armv7_common.h | 2 -- include/configs/tricorder.h | 2 -- include/configs/wb45n.h | 1 - include/configs/wb50n.h | 1 - include/configs/work_92105.h | 1 - scripts/config_whitelist.txt | 2 -- 90 files changed, 123 insertions(+), 52 deletions(-) diff --git a/README b/README index 255c9c5..a09912d 100644 --- a/README +++ b/README @@ -2777,14 +2777,9 @@ FIT uImage format: CONFIG_SPL_NAND_BASE Include nand_base.c in the SPL. Requires - CONFIG_SPL_NAND_DRIVERS. - CONFIG_SPL_NAND_DRIVERS SPL uses normal NAND drivers, not minimal drivers. - CONFIG_SPL_NAND_ECC - Include standard software ECC in the SPL - CONFIG_SPL_NAND_SIMPLE Support for NAND boot using simple NAND drivers that expose the cmd_ctrl() interface. diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index cb6b1b3..1a971fd 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -50,6 +50,8 @@ CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 332114e..151a7ed 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -34,6 +34,8 @@ CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index dce1184..4f55fc0 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -27,6 +27,8 @@ CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD_NOR_FLASH=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 4d79b0f..d04c157 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -31,6 +31,8 @@ CONFIG_DFU_NAND=y CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index b1d3ced..34ad928 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -43,6 +43,8 @@ CONFIG_DM_MMC=y # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig index f068971..d51a323 100644 --- a/configs/am335x_hs_evm_uart_defconfig +++ b/configs/am335x_hs_evm_uart_defconfig @@ -40,6 +40,8 @@ CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index 087cb3c..414fd77 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -52,6 +52,8 @@ CONFIG_EFI_PARTITION=y CONFIG_ENV_IS_IN_UBI=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index 1156773..d605fb5 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -29,6 +29,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index a2f5c70..5c0c8a1 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -37,6 +37,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index bf4bed8..d9269ec 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -34,6 +34,8 @@ CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_PHYLIB=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index b9be6b7..2ec4a83 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -49,6 +49,8 @@ CONFIG_DFU_RAM=y CONFIG_DFU_SF=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_PHYLIB=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 1374302..b7d18fc 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -57,6 +57,8 @@ CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_PHYLIB=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 0117f06..a94a2f1 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -45,6 +45,8 @@ CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_PHYLIB=y diff --git a/configs/axm_defconfig b/configs/axm_defconfig index 05d2c8b..23dc557 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -39,6 +39,8 @@ CONFIG_ENV_IS_IN_NAND=y # CONFIG_MMC is not set CONFIG_NAND=y CONFIG_NAND_ATMEL=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig index 94aa581..3c58bf3 100644 --- a/configs/brppt1_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -54,6 +54,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_NETCONSOLE=y # CONFIG_MMC is not set CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 1e24f2b..1c83d02 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -40,6 +40,8 @@ CONFIG_EFI_PARTITION=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig index f84caed..7d10aa9 100644 --- a/configs/chiliboard_defconfig +++ b/configs/chiliboard_defconfig @@ -41,6 +41,8 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DM_GPIO=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index d038c13..e13accd 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -55,6 +55,8 @@ CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y CONFIG_FAT_WRITE=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index bc7f210..62e7f4d 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -42,6 +42,8 @@ CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 97f5f1e..6a24574 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -56,6 +56,8 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 4c6b0b4..cb07e07 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -43,6 +43,8 @@ CONFIG_DFU_NAND=y # CONFIG_MMC is not set CONFIG_NAND=y CONFIG_NAND_ATMEL=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_PHYLIB=y # CONFIG_SPL_DM_SERIAL is not set CONFIG_ATMEL_USART=y diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig index 61dfdc6..7597579 100644 --- a/configs/devkit3250_defconfig +++ b/configs/devkit3250_defconfig @@ -35,6 +35,8 @@ CONFIG_DM_GPIO=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_PHYLIB=y CONFIG_DM_SERIAL=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index bd34f40..dc5c169 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -35,6 +35,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index 8f438af..d517b05 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -55,6 +55,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index 1037dd4..5477405 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -30,6 +30,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index 887f3e7..f264b94 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -56,6 +56,8 @@ CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_MAX_NAND_DEVICE=3 +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 995ddeb..9d87bc3 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -33,6 +33,8 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index e1bb505..9d655cd 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_defconfig @@ -33,6 +33,8 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_NETDEVICES=y diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig index ffe5382..d39acf9 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -36,4 +36,6 @@ CONFIG_ENV_IS_IN_NAND=y # CONFIG_MMC is not set CONFIG_NAND=y CONFIG_NAND_DAVINCI=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SYS_NS16550=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index 67b4600..6274452 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -39,6 +39,8 @@ CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y CONFIG_NAND_DAVINCI=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index c5f9a3d..5e86f65 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -38,6 +38,8 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_NAND_DAVINCI=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index b592c65..cef43a4 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -39,6 +39,8 @@ CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y CONFIG_NAND_DAVINCI=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 415c65f..3480f39 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -39,6 +39,8 @@ CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y CONFIG_NAND_DAVINCI=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index 90a5b78..4868cf2 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -38,6 +38,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index f876a92..9d1bfd7 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -35,6 +35,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index ec8df08..3c4fa4b 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -46,6 +46,8 @@ CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index f176151..275d27f 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -44,6 +44,8 @@ CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index 4f21cba..a006527 100644 --- a/configs/omap3_ha_defconfig +++ b/configs/omap3_ha_defconfig @@ -29,6 +29,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 8d8fed6..e0a7e02 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -42,6 +42,8 @@ CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index d5d4bd8..80c7f80 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -45,6 +45,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index c144f48..02f0bda 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -33,6 +33,8 @@ CONFIG_NAND_DAVINCI=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000 +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 924b6b1..5656776 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -57,6 +57,8 @@ CONFIG_EFI_PARTITION=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index bb9fdc1..3bd223a 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -58,6 +58,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 557b6ca..207d893 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -55,6 +55,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 92814a9..ffd42e4 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -59,6 +59,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index 303024d..07962fc 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -53,6 +53,7 @@ CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y +CONFIG_SPL_NAND_DRIVERS=y CONFIG_DM_ETH=y CONFIG_MACB=y CONFIG_PINCTRL=y diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index 5eca2cb..453183e 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -54,6 +54,7 @@ CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD_NOR_FLASH=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y +CONFIG_SPL_NAND_DRIVERS=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index 576bcf3..2117aa8 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -51,6 +51,7 @@ CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y +CONFIG_SPL_NAND_DRIVERS=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index 617f95e..652a509 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -51,6 +51,7 @@ CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y +CONFIG_SPL_NAND_DRIVERS=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 0fcbd69..139944d 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -46,6 +46,8 @@ CONFIG_DFU_NAND=y # CONFIG_MMC is not set CONFIG_NAND=y CONFIG_NAND_ATMEL=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_PHYLIB=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index d229bd4..eeefb13 100644 --- a/configs/tao3530_defconfig +++ b/configs/tao3530_defconfig @@ -29,6 +29,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 5643630..11eec76 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -49,6 +49,8 @@ CONFIG_DFU_NAND=y # CONFIG_MMC is not set CONFIG_NAND=y CONFIG_NAND_ATMEL=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index c5f3f22..efe6389 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -55,6 +55,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index b51e347..b72d47e 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -45,6 +45,8 @@ CONFIG_SYS_I2C_OMAP24XX=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y # CONFIG_USE_PRIVATE_LIBGCC is not set diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index 8557454..6b69568 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -38,6 +38,8 @@ CONFIG_LED_STATUS_STATE2=2 CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_BCH=y diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index 555d777..e5302b4 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -37,6 +37,8 @@ CONFIG_LED_STATUS_STATE2=2 CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_BCH=y diff --git a/configs/twister_defconfig b/configs/twister_defconfig index cd8e51f..4937469 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -35,6 +35,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig index 8ee5f03..cff1d8c 100644 --- a/configs/wb45n_defconfig +++ b/configs/wb45n_defconfig @@ -26,5 +26,6 @@ CONFIG_CMD_PING=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y +CONFIG_SPL_NAND_DRIVERS=y CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/wb50n_defconfig b/configs/wb50n_defconfig index a5fe375..1a8cde8 100644 --- a/configs/wb50n_defconfig +++ b/configs/wb50n_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_PING=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NAND=y CONFIG_NAND_ATMEL=y +CONFIG_SPL_NAND_DRIVERS=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig index dbc3566..3a30ed9 100644 --- a/configs/work_92105_defconfig +++ b/configs/work_92105_defconfig @@ -35,6 +35,7 @@ CONFIG_SPL_DM=y CONFIG_DM_GPIO=y # CONFIG_MMC is not set CONFIG_NAND=y +CONFIG_SPL_NAND_DRIVERS=y CONFIG_PHYLIB=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index fc1ccdd..9c51ddc 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -249,6 +249,16 @@ config SPL_NAND_DENALI This is a small implementation of the Denali NAND controller for use on SPL. +config SPL_NAND_DRIVERS + bool "SPL uses normal NAND drivers" + help + SPL uses normal NAND drivers, not minimal drivers. + +config SPL_NAND_ECC + bool "Enable SPL NAND ECC" + help + Include standard software ECC in the SPL + config SPL_NAND_SIMPLE bool "Use simple SPL NAND driver" depends on !SPL_NAND_AM33XX_BCH diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index f1374cf..d3e157a 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -240,8 +240,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC /* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 40c2fcb..07686a2 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -228,7 +228,5 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC #endif /* __CONFIG_H */ diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 6e71b41..8e576d8 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -123,9 +123,7 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 9e2c9c8..dfaef8f 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -181,7 +181,6 @@ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400 #elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index cef89e9..04ca0e4 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -154,7 +154,6 @@ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400 #elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 0894821..810939e 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -72,8 +72,6 @@ #ifdef CONFIG_NAND #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 #endif /* CONFIG_NAND */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 9c2b6bc..35faa26 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -225,8 +225,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC /* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 3d08043..49bcaf2 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -122,9 +122,7 @@ #define CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_MAX_SIZE #define CONFIG_SPL_BSS_MAX_SIZE (SZ_2K) -#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_RAW_ONLY #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 1fed7d0..355d05d 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -205,8 +205,6 @@ #define CONFIG_SYS_NAND_ECCBYTES 10 #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_LOAD #endif diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index f8150f0..5fce3ff 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -178,9 +178,7 @@ /* SPL loads an image from NAND */ #define CONFIG_SPL_NAND_RAW_ONLY -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SPL_MAX_SIZE 0x20000 diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index de70b6d..b60b6c3 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -169,8 +169,6 @@ #define CONFIG_SYS_NAND_ECCBYTES 10 #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_LOAD /* diff --git a/include/configs/mcx.h b/include/configs/mcx.h index cd6f019..96985f5 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -260,8 +260,6 @@ /* Defines for SPL */ #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/ #define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 0c578a0..ca4e71a 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -185,8 +185,6 @@ #define CONFIG_SYS_NAND_ECCBYTES 10 #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_LOAD #endif diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index b27745c..d91e75f 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -82,7 +82,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 33465e8..d5e158c 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -106,7 +106,6 @@ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 1edbfd3..4f7d70e 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -65,7 +65,6 @@ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #endif #define CONFIG_PMECC_CAP 8 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index ad0b22e..712e64b 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -62,7 +62,6 @@ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #endif #define CONFIG_PMECC_CAP 8 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index e1b6b57..4703fb9 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -115,8 +115,6 @@ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index f76a3c0..6d82182 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -205,9 +205,7 @@ #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) #define CONFIG_SYS_USE_NANDFLASH 1 -#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_RAW_ONLY #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 9c11fba..36453bc 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -156,8 +156,6 @@ #define CONFIG_SPL_NAND_WORKSPACE 0x8f07f000 /* below BSS */ #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/ #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index db0e3f0..dc732f1 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -211,8 +211,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC /* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/taurus.h b/include/configs/taurus.h index dd7771e..f0e8414 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -164,9 +164,7 @@ #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) #define CONFIG_SYS_USE_NANDFLASH 1 -#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_RAW_ONLY #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 4caa19c..e0f67c7 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -203,8 +203,6 @@ #ifdef CONFIG_NAND #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #endif #endif /* !CONFIG_NOR_BOOT */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 0b88a9d..257e95c 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -232,8 +232,6 @@ /* Defines for SPL */ #define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index 50e5b07..d2c754e 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -144,7 +144,6 @@ #define CONFIG_SYS_MCKR 0x1301 #define CONFIG_SYS_MCKR_CSS 0x1302 -#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h index f0646bc..f031d23 100644 --- a/include/configs/wb50n.h +++ b/include/configs/wb50n.h @@ -122,7 +122,6 @@ #define CONFIG_SYS_MONITOR_LEN (512 << 10) -#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index b9addd0..a7e7d4f 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -156,7 +156,6 @@ /* Use the framework and generic lib */ /* SPL will use serial */ /* SPL will load U-Boot from NAND offset 0x40000 */ -#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_BOOT #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00040000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 27dc8d8..468f445 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2060,8 +2060,6 @@ CONFIG_SPL_MPC83XX_WAIT_FOR_NAND CONFIG_SPL_MXS_PSWITCH_WAIT CONFIG_SPL_NAND_BASE CONFIG_SPL_NAND_BOOT -CONFIG_SPL_NAND_DRIVERS -CONFIG_SPL_NAND_ECC CONFIG_SPL_NAND_INIT CONFIG_SPL_NAND_LOAD CONFIG_SPL_NAND_MINIMAL -- 2.7.4

2 1

[U-Boot] reading ubi from a NAND for programming to other devices
by Tim Harvey 26 Jan '18

26 Jan '18

Greetings, I'm looking to understand what methods are available for reading/writing ubi/ubifs from an existing NAND flash in order to duplicate the contents onto another device in U-Boot, Linux, and with JTAG flashing for production. Typically I create ubi's using ubinize then I can use U-Boot 'nand erase' and 'nand write' or JTAG to write the ubi without issues. However if I use U-Boot 'nand read' to read a ubi then write it back using the same method I get 'ubi0 warning: ubi_io_read: error -74 (ECC error)' and 'ubi0 error: ubi_io_read: error -74 (ECC error)' messages from Linux when its mounted. I find I run into the same problem when JTAG programming ubi's: no issues when using a ubi created via ubinize but when flashing one that came from a U-Boot 'nand read' I see ubi errors when mounting it. Some testing shows me that I can't use U-Boot nand read/erase/write once U-Boot has 'attached' the UBI (via the U-Boot 'ubi part' command) which scans and re-sizes the volume. If I on the other hand take a ubi from U-Boot 'nand read' and use Linux ubiformat to flash that onto a new device I get no ubi warnings/errors when its mounted. My understanding is that ubiformat is simply preserving erase counters but there must be something else its doing. What's going on here and what can I do in U-Boot/JTAG to properly write ubi that's been read from an existing system? I'm hoping there is a method that doesn't require iterating over the individual volumes within the ubi. Best Regards, Tim

2 1

[U-Boot] [PATCH] autoboot.c: Init SHA buffer size in passwd_abort
by Martin Etnestad 26 Jan '18

26 Jan '18

The call to hash_block in passwd_abort fails with error ENOSPC on some systems. The reason is that the variable which specifies the size of the buffer to contain the computed hash does not get initialized. This patch initializes the variable with the size of the buffer. Signed-off-by: Martin Etnestad <martin.etnestad(a)appeartv.com> --- common/autoboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/autoboot.c b/common/autoboot.c index a011865028..2eef7a04cc 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -57,7 +57,7 @@ static int passwd_abort(uint64_t etime) const char *algo_name = "sha256"; u_int presskey_len = 0; int abort = 0; - int size; + int size = sizeof(sha); int ret; if (sha_env_str == NULL) -- 2.15.1

1 0

[U-Boot] [PATCH 1/7] soft_i2c: cleanup - no 8xx support
by Christophe Leroy 26 Jan '18

26 Jan '18

commit 907208c452999 ("powerpc: Partialy restore core of mpc8xx") didn't bring back support for I2C on the 8xx Signed-off-by: Christophe Leroy <christophe.leroy(a)c-s.fr> --- drivers/i2c/soft_i2c.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index 4fd5551a22..cc9c5ef356 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -25,9 +25,6 @@ #include <asm/arch/gpio.h> #endif #endif -#if defined(CONFIG_8xx) -#include <asm/io.h> -#endif #include <i2c.h> #if defined(CONFIG_SOFT_I2C_GPIO_SCL) -- 2.13.3

1 6

[U-Boot] [PATCH 1/1] efi_loader: consistently use %pD to print device paths
by Heinrich Schuchardt 26 Jan '18

26 Jan '18

Now that we have %pD support in vsprintf we should avoid separate logic for printing device paths in other places. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_bootmgr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index 857d88a879..c96b9d48c5 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -120,11 +120,9 @@ static void *try_load_entry(uint16_t n, struct efi_device_path **device_path, if (lo.attributes & LOAD_OPTION_ACTIVE) { efi_status_t ret; - u16 *str = NULL; - debug("%s: trying to load \"%ls\" from: %ls\n", __func__, - lo.label, (str = efi_dp_str(lo.file_path))); - efi_free_pool(str); + debug("%s: trying to load \"%ls\" from %pD\n", + __func__, lo.label, lo.file_path); ret = efi_load_image_from_path(lo.file_path, &image); -- 2.15.1

1 0

[U-Boot] [PATCH 00/10] mips: bmips: add SPI support
by Álvaro Fernández Rojas 26 Jan '18

26 Jan '18

BCM63xx SPI controller is a bit tricky since it doesn't allow keeping CS active between transfers, so I had to modify the spi_flash driver in order to allow limiting reads. Álvaro Fernández Rojas (10): drivers: spi: allow limiting reads drivers: spi: add config to consider command bytes when writting to flash dm: spi: add BCM63xx SPI driver mips: bmips: add bcm63xx-spi driver support for BCM6338 mips: bmips: add bcm63xx-spi driver support for BCM6348 mips: bmips: add bcm63xx-spi driver support for BCM6358 mips: bmips: add bcm63xx-spi driver support for BCM3380 mips: bmips: add bcm63xx-spi driver support for BCM63268 mips: bmips: enable the SPI flash on the Sagem F@ST1704 mips: bmips: enable the SPI flash on the Netgear CG3100D arch/mips/dts/brcm,bcm3380.dtsi | 13 ++ arch/mips/dts/brcm,bcm63268.dtsi | 13 ++ arch/mips/dts/brcm,bcm6338.dtsi | 13 ++ arch/mips/dts/brcm,bcm6348.dtsi | 13 ++ arch/mips/dts/brcm,bcm6358.dtsi | 13 ++ arch/mips/dts/netgear,cg3100d.dts | 13 ++ arch/mips/dts/sagem,f(a)st1704.dts | 13 ++ configs/netgear_cg3100d_ram_defconfig | 8 + configs/sagem_f@st1704_ram_defconfig | 8 + drivers/mtd/spi/spi_flash.c | 5 +- drivers/spi/Kconfig | 26 +++ drivers/spi/Makefile | 1 + drivers/spi/bcm63xx_spi.c | 404 ++++++++++++++++++++++++++++++++++ include/spi.h | 11 +- 14 files changed, 552 insertions(+), 2 deletions(-) create mode 100644 drivers/spi/bcm63xx_spi.c -- 2.1.4

4 186

[U-Boot] [PATCH v3 0/3] cadence-quadspi: Fix issues with non 32bit aligned accesses
by Vignesh R 26 Jan '18

26 Jan '18

This series reverts use of bounce_buf.c for non-DMA related alignment restriction and replaces it with local bounce buffer to handle problems with non 32 bit aligned writes on TI platforms. Based on top of Jason's series: [PATCH v6 0/4] spi: cadence_spi: Adopt Linux DT bindings Tested on K2G EVM. v3: Rebased on top of latest u-boot-spi/master changes. Goldschmidt Simon (1): Revert "spi: cadence_qspi_apb: Use 32 bit indirect read transaction when possible" Vignesh R (2): Revert "spi: cadence_qspi_apb: Use 32 bit indirect write transaction when possible" spi: cadence_qspi_apb: Make flash writes 32 bit aligned drivers/spi/cadence_qspi_apb.c | 53 ++++++++++++++++++++-------------------- include/configs/k2g_evm.h | 1 - include/configs/socfpga_common.h | 1 - include/configs/stv0991.h | 1 - 4 files changed, 26 insertions(+), 30 deletions(-) -- 2.16.0

2 4

[U-Boot] [PATCH v6 0/4] spi: cadence_spi: Adopt Linux DT bindings
by Jason Rush 26 Jan '18

26 Jan '18

Adopt the Linux DT bindings. This also fixes an issue with the indaddrtrig register on the Cadence QSPI device being programmed with the wrong value for the socfpga arch. Tested on TI K2G platform: Tested-by: Vignesh R <vigneshr(a)ti.com> Tested on a socfpga-cyclonev board: Tested-by: Simon Goldschmidt <sgoldschmidt(a)de.pepperl-fuchs.com> Signed-off-by: Jason Rush <jarush(a)gmail.com> Reviewed-by: Jagan Teki <jagan(a)openedev.com> Acked-by: Simon Goldschmidt <sgoldschmidt(a)de.pepperl-fuchs.com> Acked-by: Marek Vasut <marex(a)denx.de> Jason Rush (4): spi: cadence_spi: Sync DT bindings with Linux dts: cadence_spi: Sync DT bindings with Linux config: cadence_spi: Remove defines read from DT dts: cadence_spi: Update documentation for DT bindings arch/arm/dts/keystone-k2g-evm.dts | 75 +++++++++++++-------------- arch/arm/dts/keystone-k2g.dtsi | 5 +- arch/arm/dts/socfpga.dtsi | 5 +- arch/arm/dts/socfpga_arria10.dtsi | 4 +- arch/arm/dts/socfpga_arria5_socdk.dts | 9 ++-- arch/arm/dts/socfpga_cyclone5_is1.dts | 9 ++-- arch/arm/dts/socfpga_cyclone5_socdk.dts | 9 ++-- arch/arm/dts/socfpga_cyclone5_sockit.dts | 9 ++-- arch/arm/dts/socfpga_cyclone5_socrates.dts | 9 ++-- arch/arm/dts/socfpga_cyclone5_sr1500.dts | 9 ++-- arch/arm/dts/socfpga_cyclone5_vining_fpga.dts | 18 +++---- arch/arm/dts/stv0991.dts | 12 +++-- doc/device-tree-bindings/spi/spi-cadence.txt | 13 +++-- drivers/spi/cadence_qspi.c | 20 ++++--- drivers/spi/cadence_qspi.h | 6 ++- drivers/spi/cadence_qspi_apb.c | 15 ++---- include/configs/k2g_evm.h | 1 - include/configs/socfpga_common.h | 1 - include/configs/stv0991.h | 1 - 19 files changed, 113 insertions(+), 117 deletions(-) -- 2.11.0

2 7

[U-Boot] [PATCH v8 0/2] DW SPI: Get clock value from Device Tree
by Eugeniy Paltsev 26 Jan '18

26 Jan '18

As discussed with Marek during the LINUX-PITER here is v* patch: Add option to set spi controller clock frequency via device tree using standard clock bindings. Define dw_spi_get_clk function as 'weak' as some targets (like SOCFPGA_GEN5 and SOCFPGA_ARRIA10) don't use standard clock API and implement dw_spi_get_clk their own way in their clock manager. Get rid of clock_manager.h include in designware_spi.c as we don't use cm_get_spi_controller_clk_hz function anymore - we use redefined dw_spi_get_clk in SOCFPGA clock managers (clock_manager_gen5.c and clock_manager_arria10.c) instead. Changes v7->v8: * Fix typo in comments. Changes v6->v7: * Cleanup error handling. * Don't free clock after we successfully requeste it. Changes v5->v6: * Put the clock handle into the private data Changes v4->v5: * Get rid of usless ifdef in dw_spi_get_clk function Eugeniy Paltsev (2): SOCFPGA: clock manager: implement dw_spi_get_clk function DW SPI: Get clock value from Device Tree arch/arm/mach-socfpga/clock_manager_arria10.c | 9 +++++ arch/arm/mach-socfpga/clock_manager_gen5.c | 9 +++++ drivers/spi/designware_spi.c | 47 +++++++++++++++++++++++++-- 3 files changed, 63 insertions(+), 2 deletions(-) -- 2.9.3

5 8