Skip to contentSkip to conversation

Convert CONFIG_SYS_NAND_ECCSIZE et al to Kconfig

PATCH In review Adam Ford 3 participants 5 messages Nov 5, 2017 – Nov 21, 2017

Subsystems (6)
Arm (32-bit) Memory technology devices (MTD) Arm/Microchip (AT91) SoC support Arm/Allwinner sunXi SoC support +2 more subsystems
lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 Convert CONFIG_SYS_NAND_ECCSIZE et al to Kconfig

This converts the following to Kconfig:
CONFIG_SYS_NAND_ECCSIZE
CONFIG_SYS_NAND_ECCBYTES
CONFIG_SYS_NAND_ECCSTEPS
CONFIG_SYS_NAND_MAX_ECCPOS
CONFIG_SYS_NAND_MAX_OOBFREE

Signed-off-by Adam Ford <[email protected]>
README +0 -4
index f288176..bc3a1de 100644
@@ -2803,10 +2803,6 @@ FIT uImage format:
 		CONFIG_SYS_NAND_PAGE_SIZE, CONFIG_SYS_NAND_OOBSIZE,
 		CONFIG_SYS_NAND_BLOCK_SIZE, CONFIG_SYS_NAND_BAD_BLOCK_POS,
 		CONFIG_SYS_NAND_ECCPOS, CONFIG_SYS_NAND_ECCSIZE,
-		CONFIG_SYS_NAND_ECCBYTES
-		Defines the size and behavior of the NAND that SPL uses
-		to read U-Boot
-
 		CONFIG_SPL_NAND_BOOT
 		Add support NAND boot
arch/arm/include/asm/arch-lpc32xx/config.h +0 -2
index 3b7f6bd..5fa0c3a 100644
@@ -62,8 +62,6 @@
 #error "CONFIG_SYS_NAND_PAGE_SIZE set to an invalid value"
 #endif
 
-#define CONFIG_SYS_NAND_ECCSIZE		0x100
-#define CONFIG_SYS_NAND_ECCBYTES	3
 #define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
 						CONFIG_SYS_NAND_PAGE_SIZE)
 #endif	/* CONFIG_NAND_LPC32XX_SLC */
configs/B4420QDS_NAND_defconfig +2 -0
index 3df4500..60bf840 100644
@@ -33,6 +33,8 @@ CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/B4420QDS_SPIFLASH_defconfig +3 -0
index db5cdf9..c900c11 100644
@@ -23,6 +23,9 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/B4420QDS_defconfig +3 -0
index 6ce5b69..f2c7000 100644
@@ -22,6 +22,9 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/B4860QDS_NAND_defconfig +2 -0
index c098151..e3c23f7 100644
@@ -33,6 +33,8 @@ CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/B4860QDS_SECURE_BOOT_defconfig +3 -0
index 8354ae1..287b7d9 100644
@@ -23,6 +23,9 @@ CONFIG_CMD_EXT2=y
 CONFIG_DM=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/B4860QDS_SPIFLASH_defconfig +3 -0
index 615e01a..d73d756 100644
@@ -23,6 +23,9 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/B4860QDS_SRIO_PCIE_BOOT_defconfig +3 -0
index 573fc2e..32283e1 100644
@@ -22,6 +22,9 @@ CONFIG_CMD_EXT2=y
 CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/B4860QDS_defconfig +3 -0
index 8e7d868..aafb39b 100644
@@ -22,6 +22,9 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/CHIP_pro_defconfig +1 -0
index fa572ea..357b8f0 100644
@@ -21,6 +21,7 @@ CONFIG_ENV_UBI_VOLUME="uboot-env"
 # CONFIG_MMC is not set
 CONFIG_NAND=y
 CONFIG_NAND_SUNXI=y
+CONFIG_SYS_NAND_MAX_ECCPOS=1664
 CONFIG_AXP_ALDO3_VOLT=3300
 CONFIG_AXP_ALDO4_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
configs/MPC8572DS_36BIT_defconfig +3 -0
index bce08d1..91a8b19 100644
@@ -21,6 +21,9 @@ CONFIG_CMD_EXT2=y
 CONFIG_SYS_FSL_DDR2=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=5
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
 CONFIG_PHY_GIGE=y
configs/MPC8572DS_defconfig +3 -0
index 9dd7c73..d4a9a8e 100644
@@ -20,6 +20,9 @@ CONFIG_CMD_EXT2=y
 CONFIG_SYS_FSL_DDR2=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=5
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
 CONFIG_PHY_GIGE=y
configs/P1022DS_36BIT_NAND_defconfig +2 -0
index 8639cdb..109a325 100644
@@ -37,6 +37,8 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=5
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P1022DS_36BIT_SDCARD_defconfig +3 -0
index e42b3ca..cfb22eb 100644
@@ -34,6 +34,9 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=5
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P1022DS_36BIT_SPIFLASH_defconfig +3 -0
index 8b63180..1318c78 100644
@@ -35,6 +35,9 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=5
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P1022DS_36BIT_defconfig +3 -0
index 569d921..5e7938b 100644
@@ -25,6 +25,9 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=5
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P1022DS_NAND_defconfig +2 -0
index b133911..ed8233a 100644
@@ -36,6 +36,8 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=5
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P1022DS_SDCARD_defconfig +3 -0
index 73aca67..59df8ec 100644
@@ -33,6 +33,9 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=5
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P1022DS_SPIFLASH_defconfig +3 -0
index 49f1413..a883cce 100644
@@ -34,6 +34,9 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=5
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P1022DS_defconfig +3 -0
index d6f8a19..4d09359 100644
@@ -24,6 +24,9 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=5
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/T4160QDS_NAND_defconfig +2 -0
index ba1dfbc..8bdae8d 100644
@@ -32,6 +32,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/T4160QDS_SDCARD_defconfig +3 -0
index 5422278..7ba72ce 100644
@@ -31,6 +31,9 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/T4160QDS_SECURE_BOOT_defconfig +3 -0
index 8462ff5..051fd2b 100644
@@ -22,6 +22,9 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/T4160QDS_defconfig +3 -0
index c069cf5..b9c0efe 100644
@@ -21,6 +21,9 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/T4160RDB_defconfig +3 -0
index cb5359a..914bf90 100644
@@ -21,6 +21,9 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/T4240QDS_NAND_defconfig +2 -0
index cd03973..4bfd730 100644
@@ -32,6 +32,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/T4240QDS_SDCARD_defconfig +3 -0
index 95ca2a8..4457e4c 100644
@@ -31,6 +31,9 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/T4240QDS_SECURE_BOOT_defconfig +3 -0
index ff27ff5..2bd85ad 100644
@@ -22,6 +22,9 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/T4240QDS_SRIO_PCIE_BOOT_defconfig +3 -0
index 29c5489..88c0485 100644
@@ -21,6 +21,9 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/T4240QDS_defconfig +3 -0
index 4dc8ccd..9c26e1a 100644
@@ -21,6 +21,9 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/T4240RDB_SDCARD_defconfig +3 -0
index 4ac6275..83f5d9a 100644
@@ -31,6 +31,9 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/T4240RDB_defconfig +3 -0
index efd6f78..50f3789 100644
@@ -21,6 +21,9 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/am335x_baltos_defconfig +1 -0
index 5ff327b..92f86bd 100644
@@ -48,6 +48,7 @@ CONFIG_ISO_PARTITION=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND_OMAP_GPMC_PREFETCH=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
configs/am335x_evm_defconfig +1 -0
index f1bfe1a..94dce95 100644
@@ -31,6 +31,7 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND_OMAP_GPMC_PREFETCH=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHYLIB=y
configs/am335x_evm_nor_defconfig +1 -0
index 379c715..65c837c 100644
@@ -24,6 +24,7 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
 CONFIG_NAND_OMAP_GPMC_PREFETCH=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHYLIB=y
configs/am335x_evm_usbspl_defconfig +1 -0
index ebf952a..f7e4ecb 100644
@@ -28,6 +28,7 @@ CONFIG_DFU_RAM=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND_OMAP_GPMC_PREFETCH=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHYLIB=y
configs/am335x_hs_evm_defconfig +1 -0
index 35ba822..9651be4 100644
@@ -36,6 +36,7 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND_OMAP_GPMC_PREFETCH=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHYLIB=y
configs/am335x_hs_evm_uart_defconfig +1 -0
index 4e5f649..d931cd8 100644
@@ -38,6 +38,7 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND_OMAP_GPMC_PREFETCH=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHYLIB=y
configs/am335x_igep003x_defconfig +1 -0
index ecfcd78..c6b06cb 100644
@@ -49,6 +49,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_UBI=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
configs/am3517_crane_defconfig +1 -0
index a1766d9..c0484ea 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_JFFS2=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
configs/am3517_evm_defconfig +3 -0
index 385ed46..43c4c81 100644
@@ -34,6 +34,9 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND_OMAP_GPMC_PREFETCH=y
+CONFIG_SYS_NAND_ECCBYTES=13
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
configs/am43xx_evm_defconfig +1 -0
index da823f9..4d0231a 100644
@@ -31,6 +31,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=26
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHYLIB=y
configs/am43xx_evm_ethboot_defconfig +1 -0
index 6715b52..485ce40 100644
@@ -46,6 +46,7 @@ CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=26
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHYLIB=y
configs/am43xx_evm_usbhost_boot_defconfig +1 -0
index 17d22a0..c1bb5c2 100644
@@ -54,6 +54,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=26
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHYLIB=y
configs/am43xx_hs_evm_defconfig +1 -0
index a293e14..345232e 100644
@@ -42,6 +42,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=26
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHYLIB=y
configs/at91sam9m10g45ek_nandflash_defconfig +3 -0
index 45ed49a..15afa22 100644
@@ -35,6 +35,9 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCSIZE=256
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
 CONFIG_PINCTRL=y
configs/axm_defconfig +3 -0
index b013ba2..97f9c97 100644
@@ -36,6 +36,9 @@ CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
+CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCSIZE=256
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/brppt1_nand_defconfig +1 -0
index c19d737..c8ba744 100644
@@ -51,6 +51,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_NETCONSOLE=y
 # CONFIG_MMC is not set
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
configs/cairo_defconfig +1 -0
index bb79107..93b7313 100644
@@ -39,6 +39,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
configs/chiliboard_defconfig +1 -0
index 06f2b9d..3d071df 100644
@@ -39,6 +39,7 @@ CONFIG_DM_GPIO=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND_OMAP_GPMC_PREFETCH=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
configs/cm_t335_defconfig +1 -0
index 5672464..74b178f 100644
@@ -52,6 +52,7 @@ CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_FAT_WRITE=y
configs/cm_t35_defconfig +1 -0
index bf11722..13e74e6 100644
@@ -39,6 +39,7 @@ CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_NETDEVICES=y
 CONFIG_SMC911X=y
configs/cm_t43_defconfig +1 -0
index a621ff2..1003c44 100644
@@ -55,6 +55,7 @@ CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/corvus_defconfig +3 -0
index 1034f50..c1ea0ee 100644
@@ -40,6 +40,9 @@ CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
 # CONFIG_MMC is not set
+CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCSIZE=256
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_PHYLIB=y
 # CONFIG_SPL_DM_SERIAL is not set
 CONFIG_ATMEL_USART=y
configs/devkit3250_defconfig +2 -0
index 2ad08ae..11b751c 100644
@@ -34,6 +34,8 @@ CONFIG_DM_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCSIZE=256
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_PHYLIB=y
 CONFIG_DM_SERIAL=y
configs/devkit8000_defconfig +1 -0
index f42f433..210f0d1 100644
@@ -31,6 +31,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
configs/draco_defconfig +2 -0
index 79009e5..98206cb 100644
@@ -52,6 +52,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=14
+CONFIG_SYS_NAND_ECCSTEPS=4
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/eco5pk_defconfig +2 -0
index 5e00e61..d159ac0 100644
@@ -27,6 +27,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND_OMAP_GPMC_PREFETCH=y
+CONFIG_SYS_NAND_ECCSIZE=256
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
configs/etamin_defconfig +2 -0
index 796dd33..d0241fc 100644
@@ -52,6 +52,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=26
+CONFIG_SYS_NAND_ECCSTEPS=4
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/igep0032_defconfig +1 -0
index 0521039..b2c3fe2 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_UBI=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_NETDEVICES=y
configs/igep00x0_defconfig +1 -0
index a2f29cc..64304f4 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_UBI=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/ipam390_defconfig +2 -0
index a462d82..7fc3c17 100644
@@ -31,4 +31,6 @@ CONFIG_CMD_DIAG=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
+CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=10
 CONFIG_SYS_NS16550=y
configs/ls2080a_simu_defconfig +3 -0
index 94ecdba..41415cb 100644
@@ -30,6 +30,9 @@ CONFIG_CMD_CACHE=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
configs/ls2080aqds_SECURE_BOOT_defconfig +3 -0
index 2937ba9..c8a5747 100644
@@ -28,6 +28,9 @@ CONFIG_OF_CONTROL=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
configs/ls2080aqds_defconfig +3 -0
index 58eea7f..f44539c 100644
@@ -29,6 +29,9 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
configs/ls2080aqds_nand_defconfig +2 -0
index e6f1e53..d889d27 100644
@@ -39,6 +39,8 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
configs/ls2080aqds_qspi_defconfig +3 -0
index 79307f8..db9ff29 100644
@@ -29,6 +29,9 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
configs/ls2080aqds_sdcard_defconfig +3 -0
index 0e8b7d0..b644d05 100644
@@ -36,6 +36,9 @@ CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
configs/ls2080ardb_SECURE_BOOT_defconfig +3 -0
index a8e4fdd..154582b 100644
@@ -27,6 +27,9 @@ CONFIG_OF_CONTROL=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
configs/ls2080ardb_defconfig +3 -0
index 0fd3fee..925d7f5 100644
@@ -28,6 +28,9 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
configs/ls2080ardb_nand_defconfig +2 -0
index 0f248a7..16bbc9a 100644
@@ -37,6 +37,8 @@ CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_MAX_ECCPOS=256
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
 CONFIG_PHY_GIGE=y
configs/mcx_defconfig +2 -0
index d184383..8e0af14 100644
@@ -35,6 +35,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND_OMAP_GPMC_PREFETCH=y
+CONFIG_SYS_NAND_ECCSIZE=256
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
configs/mt_ventoux_defconfig +2 -0
index b4be5a1..b040375 100644
@@ -32,6 +32,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND_OMAP_GPMC_PREFETCH=y
+CONFIG_SYS_NAND_ECCSIZE=256
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
configs/omap3_beagle_defconfig +1 -0
index 1dd1b31..9a9b836 100644
@@ -38,6 +38,7 @@ CONFIG_LED_STATUS_GREEN=2
 CONFIG_LED_STATUS_CMD=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
configs/omap3_evm_defconfig +1 -0
index 5103e9f..d6e7b00 100644
@@ -42,6 +42,7 @@ CONFIG_DM_GPIO=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MTD=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_NETDEVICES=y
configs/omap3_ha_defconfig +1 -0
index 7e05d96..05d3712 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
configs/omap3_logic_defconfig +3 -0
index fc3c6fe..27ebbf5 100644
@@ -33,6 +33,9 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP36XX_PINS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=13
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
configs/omap3_overo_defconfig +2 -0
index 2c896fc..6988340 100644
@@ -41,6 +41,8 @@ CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=13
+CONFIG_SYS_NAND_MAX_ECCPOS=56
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_NETDEVICES=y
configs/omapl138_lcdk_defconfig +1 -0
index 8d6b12f..1b5abea 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=10
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000
configs/pengwyn_defconfig +2 -0
index b6f5e7d..bcb6c9a 100644
@@ -54,6 +54,8 @@ CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=26
+CONFIG_SYS_NAND_ECCSTEPS=8
 CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
configs/pxm2_defconfig +2 -0
index 1cac801..6c50a21 100644
@@ -55,6 +55,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=14
+CONFIG_SYS_NAND_ECCSTEPS=4
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/rastaban_defconfig +2 -0
index 3902548..22930af 100644
@@ -52,6 +52,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=14
+CONFIG_SYS_NAND_ECCSTEPS=4
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/rut_defconfig +2 -0
index 9590001..b9aad8a 100644
@@ -56,6 +56,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=14
+CONFIG_SYS_NAND_ECCSTEPS=4
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/smartweb_defconfig +3 -0
index 765d0fa..8d5904f 100644
@@ -41,6 +41,9 @@ CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
 # CONFIG_MMC is not set
+CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCSIZE=256
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_PHYLIB=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
configs/tao3530_defconfig +1 -0
index 40982fc..7222b75 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
configs/taurus_defconfig +3 -0
index 9e9f6fb..f1ac05c 100644
@@ -46,6 +46,9 @@ CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
 # CONFIG_MMC is not set
+CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCSIZE=256
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/thuban_defconfig +2 -0
index ece511f..c18227b 100644
@@ -52,6 +52,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=14
+CONFIG_SYS_NAND_ECCSTEPS=4
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/ti816x_evm_defconfig +1 -0
index 812b499..49667a9 100644
@@ -41,6 +41,7 @@ CONFIG_SYS_I2C_OMAP24XX=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND_OMAP_GPMC_PREFETCH=y
+CONFIG_SYS_NAND_ECCBYTES=14
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
configs/tricorder_defconfig +3 -0
index 00a5cc9..5c0bc94 100644
@@ -35,6 +35,9 @@ CONFIG_LED_STATUS_STATE2=2
 CONFIG_LED_STATUS_CMD=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=13
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
 CONFIG_BCH=y
configs/tricorder_flash_defconfig +3 -0
index 0da1c35..f819684 100644
@@ -34,6 +34,9 @@ CONFIG_LED_STATUS_STATE2=2
 CONFIG_LED_STATUS_CMD=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_ECCBYTES=13
+CONFIG_SYS_NAND_MAX_ECCPOS=56
+CONFIG_SYS_NAND_MAX_OOBFREE=2
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
 CONFIG_BCH=y
configs/twister_defconfig +2 -0
index 90b2fde..cfae3ae 100644
@@ -32,6 +32,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND_OMAP_GPMC_PREFETCH=y
+CONFIG_SYS_NAND_ECCSIZE=256
+CONFIG_SYS_NAND_ECCBYTES=3
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_NETDEVICES=y
drivers/mtd/nand/Kconfig +34 -0
index 794410a..eb5dc3a 100644
@@ -166,6 +166,40 @@ config NAND_ZYNQ
 
 comment "Generic NAND options"
 
+config SYS_NAND_ECCSIZE
+	int "NAND ECC Size"
+	default 512
+	help
+	  Defines the size and behavior of the NAND that SPL uses to read U-Boot
+
+config SYS_NAND_ECCBYTES
+	int "NAND ECC Bytes"
+	default 0
+	help
+	  Defines the size and behavior of the NAND that SPL uses to read U-Boot
+
+config SYS_NAND_ECCSTEPS
+	int "NAND ECC Steps"
+	default 0
+	help
+	  Defines the size and behavior of the NAND that SPL uses to read U-Boot
+
+config SYS_NAND_MAX_ECCPOS
+	int "Max number of ECC bytes"
+	default 0
+	help
+	  If specified, overrides the maximum number of ECC bytes
+	  supported.  Useful for reducing image size, especially with SPL.
+	  This must be at least 48 if nand_base.c is used.
+
+config SYS_NAND_MAX_OOBFREE
+	int "Max number of free OOB regions"
+	default 0
+	help
+	  If specified, overrides the maximum number of free OOB regions
+	  supported.  Useful for reducing image size, especially with SPL.
+	  This must be at least 2 if nand_base.c is used.
+
 # Enhance depends when converting drivers to Kconfig which use this config
 # option (mxc_nand, ndfc, omap_gpmc).
 config SYS_NAND_BUSWIDTH_16BIT
include/configs/B4860QDS.h +0 -2
index 661bc8b..d4a2f7c 100644
@@ -312,8 +312,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* NAND Flash on IFC */
 #define CONFIG_NAND_FSL_IFC
-#define CONFIG_SYS_NAND_MAX_ECCPOS	256
-#define CONFIG_SYS_NAND_MAX_OOBFREE	2
 #define CONFIG_SYS_NAND_BASE		0xff800000
 #ifdef CONFIG_PHYS_64BIT
 #define CONFIG_SYS_NAND_BASE_PHYS	(0xf00000000ull | CONFIG_SYS_NAND_BASE)
include/configs/MPC8572DS.h +0 -2
index b277cdb..8846ef5 100644
@@ -287,8 +287,6 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE    4
 #define CONFIG_NAND_FSL_ELBC	1
 #define CONFIG_SYS_NAND_BLOCK_SIZE    (128 * 1024)
-#define CONFIG_SYS_NAND_MAX_OOBFREE	5
-#define CONFIG_SYS_NAND_MAX_ECCPOS	56
 
 /* NAND boot: 4K NAND loader config */
 #define CONFIG_SYS_NAND_SPL_SIZE	0x1000
include/configs/P1022DS.h +0 -2
index aadbe02..71ff2ab 100644
@@ -52,8 +52,6 @@
 #endif
 
 #define CONFIG_NAND_FSL_ELBC
-#define CONFIG_SYS_NAND_MAX_ECCPOS	56
-#define CONFIG_SYS_NAND_MAX_OOBFREE	5
 
 #ifdef CONFIG_NAND
 #ifdef CONFIG_TPL_BUILD
include/configs/T4240QDS.h +0 -2
index 885dc77..ae3c3fc 100644
@@ -260,8 +260,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 
 #define CONFIG_SYS_NAND_BLOCK_SIZE	(128 * 1024)
-#define CONFIG_SYS_NAND_MAX_OOBFREE	2
-#define CONFIG_SYS_NAND_MAX_ECCPOS	256
 
 #if defined(CONFIG_NAND)
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NAND_CSPR_EXT
include/configs/T4240RDB.h +0 -2
index 625130a..f309a17 100644
@@ -398,8 +398,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* NAND Flash on IFC */
 #define CONFIG_NAND_FSL_IFC
-#define CONFIG_SYS_NAND_MAX_ECCPOS	256
-#define CONFIG_SYS_NAND_MAX_OOBFREE	2
 #define CONFIG_SYS_NAND_BASE		0xff800000
 #define CONFIG_SYS_NAND_BASE_PHYS	(0xf00000000ull | CONFIG_SYS_NAND_BASE)
include/configs/am335x_evm.h +0 -2
index 0e08264..9c241c4 100644
@@ -211,8 +211,6 @@
 					 42, 43, 44, 45, 46, 47, 48, 49, \
 					 50, 51, 52, 53, 54, 55, 56, 57, }
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	14
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW
 #define MTDIDS_DEFAULT			"nand0=nand.0"
include/configs/am335x_igep003x.h +0 -2
index 2400eee..bc6ebc2 100644
@@ -158,8 +158,6 @@
 					 42, 43, 44, 45, 46, 47, 48, 49, \
 					 50, 51, 52, 53, 54, 55, 56, 57, }
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	14
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW
 
 #endif	/* ! __CONFIG_IGEP003X_H */
include/configs/am3517_crane.h +0 -2
index 400a06e..b2fbecd 100644
@@ -256,8 +256,6 @@
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	NAND_LARGE_BADBLOCK_POS
 #define CONFIG_SYS_NAND_ECCPOS		{2, 3, 4, 5, 6, 7, 8, 9,\
 						10, 11, 12, 13}
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	3
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_HAM1_CODE_HW
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
include/configs/am3517_evm.h +0 -4
index f4d2a2e..5ec8906 100644
@@ -88,11 +88,7 @@
 					 40, 41, 42, 44, 45, 46, 47, 48, 49, \
 					 50, 51, 52, 53, 54, 55, 56 }
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	13
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
-#define CONFIG_SYS_NAND_MAX_OOBFREE	2
-#define CONFIG_SYS_NAND_MAX_ECCPOS	56
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
 #define CONFIG_MTD_PARTITIONS		/* required for UBI partition support */
include/configs/am43xx_evm.h +0 -2
index 159954d..6f4844d 100644
@@ -281,8 +281,6 @@
 			190, 191, 192, 193, 194, 195, 196, 197, 198, 199, \
 			200, 201, 202, 203, 204, 205, 206, 207, 208, 209, \
 			}
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	26
 #define MTDIDS_DEFAULT			"nand0=nand.0"
 #define MTDPARTS_DEFAULT		"mtdparts=nand.0:" \
 					"256k(NAND.SPL)," \
include/configs/at91sam9m10g45ek.h +0 -2
index 2957da9..ef48e22 100644
@@ -138,8 +138,6 @@
 #define CONFIG_SYS_NAND_BLOCK_SIZE	0x20000
 #define CONFIG_SYS_NAND_PAGE_COUNT	64
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	NAND_LARGE_BADBLOCK_POS
-#define CONFIG_SYS_NAND_ECCSIZE		256
-#define CONFIG_SYS_NAND_ECCBYTES	3
 #define CONFIG_SYS_NAND_OOBSIZE		64
 #define CONFIG_SYS_NAND_ECCPOS		{ 40, 41, 42, 43, 44, 45, 46, 47, \
 					  48, 49, 50, 51, 52, 53, 54, 55, \
include/configs/baltos.h +0 -2
index 6435e5d..ed721bb 100644
@@ -257,8 +257,6 @@
 					 42, 43, 44, 45, 46, 47, 48, 49, \
 					 50, 51, 52, 53, 54, 55, 56, 57, }
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	14
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
include/configs/bav335x.h +0 -2
index e7770b6..6c04538 100644
@@ -365,8 +365,6 @@ DEFAULT_LINUX_BOOT_ENV \
 	42, 43, 44, 45, 46, 47, 48, 49, \
 	50, 51, 52, 53, 54, 55, 56, 57, }
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	14
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW
 #define MTDIDS_DEFAULT			"nand0=nand.0"
include/configs/brppt1.h +0 -3
index 2af575a..f45644e 100644
@@ -200,9 +200,6 @@ MMCARGS
 					42, 43, 44, 45, 46, 47, 48, 49, \
 					50, 51, 52, 53, 54, 55, 56, 57, }
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	14
-
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
include/configs/chiliboard.h +0 -2
index ff66518..585f42e 100644
@@ -144,8 +144,6 @@
 					 42, 43, 44, 45, 46, 47, 48, 49, \
 					 50, 51, 52, 53, 54, 55, 56, 57, }
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	14
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW
 #define MTDIDS_DEFAULT			"nand0=8000000.nand"
include/configs/cm_t335.h +0 -3
index 2287d5b..d9f2b96 100644
@@ -117,9 +117,6 @@
 					 42, 43, 44, 45, 46, 47, 48, 49, \
 					 50, 51, 52, 53, 54, 55, 56, 57, }
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	14
-
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
 
 #undef CONFIG_SYS_NAND_U_BOOT_OFFS
include/configs/cm_t35.h +0 -2
index 7cb3124..ff6f4bd 100644
@@ -252,8 +252,6 @@
  */
 #define CONFIG_SYS_NAND_ECCPOS		{ 1, 2, 3, 4, 5, 6, 7, 8, 9, \
 					 10, 11, 12 }
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	3
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_HAM1_CODE_HW
 
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
include/configs/cm_t43.h +0 -2
index a222491..1a83db8 100644
@@ -31,8 +31,6 @@
 #define CONFIG_SYS_NAND_OOBSIZE		64
 #define CONFIG_SYS_NAND_BLOCK_SIZE	(128 * 1024)
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	NAND_LARGE_BADBLOCK_POS
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	14
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW
 #define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
 					 CONFIG_SYS_NAND_PAGE_SIZE)
include/configs/corvus.h +0 -2
index cc671f2..10a2638 100644
@@ -141,8 +141,6 @@
 #define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
 					 CONFIG_SYS_NAND_PAGE_SIZE)
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	NAND_LARGE_BADBLOCK_POS
-#define CONFIG_SYS_NAND_ECCSIZE		256
-#define CONFIG_SYS_NAND_ECCBYTES	3
 #define CONFIG_SYS_NAND_OOBSIZE		64
 #define CONFIG_SYS_NAND_ECCPOS		{ 40, 41, 42, 43, 44, 45, 46, 47, \
 					  48, 49, 50, 51, 52, 53, 54, 55, \
include/configs/da850evm.h +0 -2
index 1250112..7078239 100644
@@ -208,8 +208,6 @@
 				59, 60, 61, 62, 63 }
 #define CONFIG_SYS_NAND_PAGE_COUNT	64
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0
-#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_DRIVERS
include/configs/devkit8000.h +0 -2
index 2c2d608..eb073da 100644
@@ -196,8 +196,6 @@
 #define CONFIG_SYS_NAND_ECCPOS		{2, 3, 4, 5, 6, 7, 8, 9,\
 						10, 11, 12, 13}
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	3
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_HAM1_CODE_HW
 
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
include/configs/dra7xx_evm.h +0 -2
index f8bffe6..66f549a 100644
@@ -176,8 +176,6 @@
 					 34, 35, 36, 37, 38, 39, 40, 41, \
 					 42, 43, 44, 45, 46, 47, 48, 49, \
 					 50, 51, 52, 53, 54, 55, 56, 57, }
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	14
 #define MTDIDS_DEFAULT			"nand0=nand.0"
 #define MTDPARTS_DEFAULT		"mtdparts=nand.0:" \
 					"128k(NAND.SPL)," \
include/configs/etamin.h +0 -5
index 7bd2c4a..9e43337 100644
@@ -53,11 +53,6 @@
 			200, 201, 202, 203, 204, 205, 206, 207, 208, 209, \
 			}
 
-#undef CONFIG_SYS_NAND_ECCSIZE
-#undef CONFIG_SYS_NAND_ECCBYTES
-#define CONFIG_SYS_NAND_ECCSIZE 512
-#define CONFIG_SYS_NAND_ECCBYTES 26
-
 #define CONFIG_SYS_NAND_U_BOOT_OFFS     0x200000
 
 #define CONFIG_SYS_NAND_MAX_CHIPS       1
include/configs/ipam390.h +0 -2
index 2bb7d07..fda423e 100644
@@ -170,8 +170,6 @@
 			54, 55, 56, 57, 58,	59, 60, 61, 62, 63}
 #define CONFIG_SYS_NAND_PAGE_COUNT	64
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0
-#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_DRIVERS
include/configs/ls1088aqds.h +0 -2
index c2e6fd2..35677df 100644
@@ -115,8 +115,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 
 #define CONFIG_NAND_FSL_IFC
-#define CONFIG_SYS_NAND_MAX_ECCPOS	256
-#define CONFIG_SYS_NAND_MAX_OOBFREE	2
 
 #define CONFIG_SYS_NAND_CSPR_EXT	(0x0)
 #define CONFIG_SYS_NAND_CSPR	(CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \
include/configs/ls1088ardb.h +0 -2
index 478ddd0..bb1b553 100644
@@ -90,8 +90,6 @@
 #define CONFIG_SYS_FLASH_BANKS_LIST	{ CONFIG_SYS_FLASH_BASE }
 #endif
 #endif
-#define CONFIG_SYS_NAND_MAX_ECCPOS	256
-#define CONFIG_SYS_NAND_MAX_OOBFREE	2
 
 #define CONFIG_SYS_NAND_CSPR_EXT	(0x0)
 #define CONFIG_SYS_NAND_CSPR	(CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \
include/configs/ls2080a_simu.h +0 -2
index dad1090..728e4c0 100644
@@ -73,8 +73,6 @@
 #endif
 
 #define CONFIG_NAND_FSL_IFC
-#define CONFIG_SYS_NAND_MAX_ECCPOS	256
-#define CONFIG_SYS_NAND_MAX_OOBFREE	2
 
 #define CONFIG_SYS_NAND_CSPR_EXT	(0x0)
 #define CONFIG_SYS_NAND_CSPR	(CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \
include/configs/ls2080aqds.h +0 -2
index f1968cc..9d2a8fd 100644
@@ -116,8 +116,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 
 #define CONFIG_NAND_FSL_IFC
-#define CONFIG_SYS_NAND_MAX_ECCPOS	256
-#define CONFIG_SYS_NAND_MAX_OOBFREE	2
 
 #define CONFIG_SYS_NAND_CSPR_EXT	(0x0)
 #define CONFIG_SYS_NAND_CSPR	(CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \
include/configs/ls2080ardb.h +0 -2
index 48c3a53..ba758a1 100644
@@ -125,8 +125,6 @@ unsigned long get_board_sys_clk(void);
 #endif
 
 #define CONFIG_NAND_FSL_IFC
-#define CONFIG_SYS_NAND_MAX_ECCPOS	256
-#define CONFIG_SYS_NAND_MAX_OOBFREE	2
 
 #define CONFIG_SYS_NAND_CSPR_EXT	(0x0)
 #define CONFIG_SYS_NAND_CSPR	(CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \
include/configs/mcx.h +0 -2
index b4b8c43..8fec2ac 100644
@@ -293,8 +293,6 @@
 #define CONFIG_SYS_NAND_ECCPOS		{40, 41, 42, 43, 44, 45, 46, 47,\
 					 48, 49, 50, 51, 52, 53, 54, 55,\
 					 56, 57, 58, 59, 60, 61, 62, 63}
-#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
include/configs/omap3_beagle.h +0 -2
index 399ed07..9d9665d 100644
@@ -252,8 +252,6 @@
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0
 #define CONFIG_SYS_NAND_ECCPOS		{2, 3, 4, 5, 6, 7, 8, 9,\
 						10, 11, 12, 13}
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	3
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_HAM1_CODE_HW
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
 /* NAND: SPL falcon mode configs */
include/configs/omap3_cairo.h +0 -2
index f9a7e0c..26444e2 100644
@@ -185,8 +185,6 @@
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0
 #define CONFIG_SYS_NAND_ECCPOS		{2, 3, 4, 5, 6, 7, 8, 9,\
 						10, 11, 12, 13}
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	3
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_HAM1_CODE_HW
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
 /* NAND: SPL falcon mode configs */
include/configs/omap3_evm.h +0 -2
index df50325..734f111 100644
@@ -58,8 +58,6 @@
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS   NAND_LARGE_BADBLOCK_POS
 #define CONFIG_SYS_NAND_ECCPOS          {2, 3, 4, 5, 6, 7, 8, 9,\
                                          10, 11, 12, 13}
-#define CONFIG_SYS_NAND_ECCSIZE         512
-#define CONFIG_SYS_NAND_ECCBYTES        3
 #define CONFIG_NAND_OMAP_ECCSCHEME      OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
 #define CONFIG_SYS_NAND_U_BOOT_OFFS     0x80000
 #define CONFIG_ENV_IS_IN_NAND           1
include/configs/omap3_igep00x0.h +0 -2
index 1a90cb5..8777c6c 100644
@@ -123,8 +123,6 @@
 					 34, 35, 36, 37, 38, 39, 40, 41, \
 					 42, 43, 44, 45, 46, 47, 48, 49, \
 					 50, 51, 52, 53, 54, 55, 56, 57, }
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	14
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
 
 /* UBI configuration */
include/configs/omap3_logic.h +0 -4
index a5a2af1..ac9e0f2 100644
@@ -80,11 +80,7 @@
 					 42, 44, 45, 46, 47, 48, 49, 50, 51, \
 					 52, 53, 54, 55, 56}
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	13
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
-#define CONFIG_SYS_NAND_MAX_OOBFREE	2
-#define CONFIG_SYS_NAND_MAX_ECCPOS	56
 #define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS		/* required for UBI partition support */
 #define MTDIDS_DEFAULT			"nand0=omap2-nand.0"
include/configs/omap3_overo.h +0 -3
index 756b50c..30ad719 100644
@@ -184,7 +184,6 @@
 #define CONFIG_SYS_INIT_RAM_SIZE	0x800
 
 /* NAND boot config */
-#define CONFIG_SYS_NAND_MAX_ECCPOS  56
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT	64
 #define CONFIG_SYS_NAND_PAGE_SIZE	2048

@@ -197,8 +196,6 @@
 					33, 34, 35, 36, 37, 38, 39, 40, 41, \
 					42, 44, 45, 46, 47, 48, 49, 50, 51, \
 					52, 53, 54, 55, 56}
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	13
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
include/configs/omapl138_lcdk.h +0 -2
index 5dba7d2..35060e1 100644
@@ -185,8 +185,6 @@
 				54, 55, 56, 57, 58, 59, 60, 61, 62, 63 }
 #define CONFIG_SYS_NAND_PAGE_COUNT	64
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0
-#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_DRIVERS
include/configs/pengwyn.h +0 -3
index 2fa280e..3a1652e 100644
@@ -136,9 +136,6 @@
 					  174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,\
 					  194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209}
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	26
-#define CONFIG_SYS_NAND_ECCSTEPS	8
 #define	CONFIG_SYS_NAND_ECCTOTAL	(CONFIG_SYS_NAND_ECCBYTES * \
 						CONFIG_SYS_NAND_ECCSTEPS)
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH16_CODE_HW
include/configs/siemens-am33x-common.h +0 -3
index 7ef95fa..4418250 100644
@@ -134,11 +134,8 @@
 					 42, 43, 44, 45, 46, 47, 48, 49, \
 					 50, 51, 52, 53, 54, 55, 56, 57, }
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	14
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW
 
-#define CONFIG_SYS_NAND_ECCSTEPS	4
 #define	CONFIG_SYS_NAND_ECCTOTAL	(CONFIG_SYS_NAND_ECCBYTES * \
 						CONFIG_SYS_NAND_ECCSTEPS)
include/configs/smartweb.h +0 -2
index 4cbc903..a41de2d 100644
@@ -234,8 +234,6 @@
 #define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
 					 CONFIG_SYS_NAND_PAGE_SIZE)
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	NAND_LARGE_BADBLOCK_POS
-#define CONFIG_SYS_NAND_ECCSIZE		256
-#define CONFIG_SYS_NAND_ECCBYTES	3
 #define CONFIG_SYS_NAND_OOBSIZE		64
 #define CONFIG_SYS_NAND_ECCPOS		{ 40, 41, 42, 43, 44, 45, 46, 47, \
 					  48, 49, 50, 51, 52, 53, 54, 55, \
include/configs/sunxi-common.h +0 -1
index 4207398..cc277f6 100644
@@ -130,7 +130,6 @@
 #define CONFIG_SERIAL_TAG
 
 #ifdef CONFIG_NAND_SUNXI
-#define CONFIG_SYS_NAND_MAX_ECCPOS 1664
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_SYS_MAX_NAND_DEVICE 8
include/configs/tam3517-common.h +0 -2
index 8082827..13ec1ca 100644
@@ -193,8 +193,6 @@
 #define CONFIG_SYS_NAND_ECCPOS		{40, 41, 42, 43, 44, 45, 46, 47,\
 					 48, 49, 50, 51, 52, 53, 54, 55,\
 					 56, 57, 58, 59, 60, 61, 62, 63}
-#define CONFIG_SYS_NAND_ECCSIZE		256
-#define CONFIG_SYS_NAND_ECCBYTES	3
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_HAM1_CODE_SW
 
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
include/configs/tao3530.h +0 -2
index 8ca50dc..414069d 100644
@@ -233,8 +233,6 @@
  */
 #define CONFIG_SYS_NAND_ECCPOS		{ 2, 3, 4, 5, 6, 7, 8, 9, \
 					 10, 11, 12, 13 }
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	3
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_HAM1_CODE_HW
 
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
include/configs/taurus.h +0 -2
index ce06f7b..101d377 100644
@@ -184,8 +184,6 @@
 #define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
 					 CONFIG_SYS_NAND_PAGE_SIZE)
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	NAND_LARGE_BADBLOCK_POS
-#define CONFIG_SYS_NAND_ECCSIZE		256
-#define CONFIG_SYS_NAND_ECCBYTES	3
 #define CONFIG_SYS_NAND_OOBSIZE		64
 #define CONFIG_SYS_NAND_ECCPOS		{ 40, 41, 42, 43, 44, 45, 46, 47, \
 					  48, 49, 50, 51, 52, 53, 54, 55, \
include/configs/ti816x_evm.h +0 -2
index ddeef60..4211262 100644
@@ -84,8 +84,6 @@
 					 42, 43, 44, 45, 46, 47, 48, 49, \
 					 50, 51, 52, 53, 54, 55, 56, 57, }
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	14
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW
 #define MTDIDS_DEFAULT			"nand0=nand.0"
include/configs/tricorder.h +0 -4
index 8e245e9..095fe6a 100644
@@ -89,8 +89,6 @@
 							/* CS0 */
 #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of NAND */
 							/* devices */
-#define CONFIG_SYS_NAND_MAX_OOBFREE	2
-#define CONFIG_SYS_NAND_MAX_ECCPOS	56
 
 /* needed for ubi */
 #define CONFIG_MTD_DEVICE       /* needed for mtdparts commands */

@@ -271,8 +269,6 @@
 					 42, 44, 45, 46, 47, 48, 49, 50, 51, \
 					 52, 53, 54, 55, 56}
 
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	13
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
 
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
scripts/config_whitelist.txt +0 -5
index 402f5c0..38941b6 100644
@@ -3875,10 +3875,7 @@ CONFIG_SYS_NAND_DATA_BASE
 CONFIG_SYS_NAND_DBW_16
 CONFIG_SYS_NAND_DBW_8
 CONFIG_SYS_NAND_DDR_LAW
-CONFIG_SYS_NAND_ECCBYTES
 CONFIG_SYS_NAND_ECCPOS
-CONFIG_SYS_NAND_ECCSIZE
-CONFIG_SYS_NAND_ECCSTEPS
 CONFIG_SYS_NAND_ECCTOTAL
 CONFIG_SYS_NAND_ECC_BASE
 CONFIG_SYS_NAND_ENABLE_PIN

@@ -3895,8 +3892,6 @@ CONFIG_SYS_NAND_LBLAWBAR_PRELIM
 CONFIG_SYS_NAND_MASK_ALE
 CONFIG_SYS_NAND_MASK_CLE
 CONFIG_SYS_NAND_MAX_CHIPS
-CONFIG_SYS_NAND_MAX_ECCPOS
-CONFIG_SYS_NAND_MAX_OOBFREE
 CONFIG_SYS_NAND_MX7_GPMI_62_ECC_BYTES
 CONFIG_SYS_NAND_NO_SUBPAGE
 CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 Convert CONFIG_SYS_NAND_ECCSIZE et al to Kconfig

Hi,

Quoted 6 lines · Adam Ford

This converts the following to Kconfig:
CONFIG_SYS_NAND_ECCSIZE
CONFIG_SYS_NAND_ECCBYTES
CONFIG_SYS_NAND_ECCSTEPS
CONFIG_SYS_NAND_MAX_ECCPOS
CONFIG_SYS_NAND_MAX_OOBFREE

Is there any plan for SYS_NAND_BLOCK_SIZE, SYS_NAND_PAGE_SIZE and SYS_NAND_OOBSIZE ?

Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171106/044a2465/attachment.sig>
author
#2 lore raw

PATCH 1/1 Convert CONFIG_SYS_NAND_ECCSIZE et al to Kconfig

Quoted 10 lines · Maxime Ripard

Hi,

Quoted 6 lines · Adam Ford

This converts the following to Kconfig:
CONFIG_SYS_NAND_ECCSIZE
CONFIG_SYS_NAND_ECCBYTES
CONFIG_SYS_NAND_ECCSTEPS
CONFIG_SYS_NAND_MAX_ECCPOS
CONFIG_SYS_NAND_MAX_OOBFREE

Quoted 3 lines

Is there any plan for SYS_NAND_BLOCK_SIZE, SYS_NAND_PAGE_SIZE and SYS_NAND_OOBSIZE ?

I went with low hanging fruit. A bunch of those have non-numeric values or reference other defines for some boards, and it'll take more time to go through them.

adam

Quoted 8 lines

Maxime

--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

#3 lore raw
In reply to Adam Ford
Quoted 8 lines · Adam Ford

This converts the following to Kconfig:
CONFIG_SYS_NAND_ECCSIZE
CONFIG_SYS_NAND_ECCBYTES
CONFIG_SYS_NAND_ECCSTEPS
CONFIG_SYS_NAND_MAX_ECCPOS
CONFIG_SYS_NAND_MAX_OOBFREE

Signed-off-by Adam Ford <[email protected]>

While getting this to apply to master still was easy, it causes a ton of build warning on am335x_evm (and many others) and run-time failure on am335x_evm. Please see if anything obvious sticks out to you, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171120/f0ab38b5/attachment.sig>
author
#4 lore raw
Quoted 9 lines · Tom Rini
Quoted 7 lines · Adam Ford

This converts the following to Kconfig:
CONFIG_SYS_NAND_ECCSIZE
CONFIG_SYS_NAND_ECCBYTES
CONFIG_SYS_NAND_ECCSTEPS
CONFIG_SYS_NAND_MAX_ECCPOS
CONFIG_SYS_NAND_MAX_OOBFREE

Quoted 6 lines
Quoted 1 line
Signed-off-by Adam Ford <[email protected]>

While getting this to apply to master still was easy, it causes a ton of build warning on am335x_evm (and many others) and run-time failure on am335x_evm. Please see if anything obvious sticks out to you, thanks!

I'll try to take a look at it when I get some time. Is there any change you can pull the Kconfig and I'll work on migrating boards' headers and defconfigs when as I can?

adam

Quoted 2 lines

--
Tom