Convert CONFIG_SYS_NAND_HW_ECC_OOBFIRST to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_NAND_HW_ECC_OOBFIRST

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/README b/README
index d75c3fbc8596c94591bcf3aecd70e439bd8684ea..4309d9338664e2cbd531abd25dc2cd24a2f3e4e9 100644 (file)
--- a/README
+++ b/README
@@ -1378,10 +1378,6 @@ The following options need to be configured:
                CONFIG_SYS_NAND_U_BOOT_START
                Entry point in loaded image to jump to
 
-               CONFIG_SYS_NAND_HW_ECC_OOBFIRST
-               Define this if you need to first read the OOB and then the
-               data. This is used, for example, on davinci platforms.
-
                CONFIG_SPL_RAM_DEVICE
                Support for running image already present in ram, in SPL binary
 

diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig
index 30454a3787a92a0d9ed93a1b41cfd92f23d62949..84563b2a3c7f5a9891bc691e61e508bcc392bb7d 100644 (file)
--- a/configs/da850evm_nand_defconfig
+++ b/configs/da850evm_nand_defconfig
@@ -87,6 +87,7 @@ CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_USE_FLASH_BBT=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST=y
+CONFIG_SYS_NAND_HW_ECC_OOBFIRST=y
 CONFIG_SYS_NAND_BLOCK_SIZE=0x20000
 CONFIG_SYS_NAND_PAGE_COUNT=0x40
 CONFIG_SYS_NAND_PAGE_SIZE=0x800

diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig
index 51c78dc51ad550aa093adaea334b5ef671ac9603..a067c017794070fba6b82281d0d6963ea149c45c 100644 (file)
--- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig
@@ -84,6 +84,7 @@ CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_USE_FLASH_BBT=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST=y
+CONFIG_SYS_NAND_HW_ECC_OOBFIRST=y
 CONFIG_SYS_NAND_BLOCK_SIZE=0x20000
 CONFIG_SYS_NAND_PAGE_COUNT=0x40
 CONFIG_SYS_NAND_PAGE_SIZE=0x800

diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index 48a7507c643bddb7feecee2561754862d3822112..49b7a4b04bb4e15b307d6721fde150beee97c3bc 100644 (file)
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -712,6 +712,11 @@ config SPL_NAND_SIMPLE
        help
          Support for NAND boot using simple NAND drivers that
          expose the cmd_ctrl() interface.
+
+config SYS_NAND_HW_ECC_OOBFIRST
+       bool "In SPL, read the OOB first and then the data from NAND"
+       depends on SPL_NAND_SIMPLE
+
 endif
 
 endif   # if NAND

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 262a79be015c4d77f1656e678f81525e35d5fe4c..abf5db934c50a0c0b7e9ec3bf9698551bdd32309 100644 (file)
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -113,7 +113,6 @@
 #define CONFIG_SYS_NAND_MASK_CLE               0x10
 #define CONFIG_SYS_NAND_MASK_ALE               0x8
 #undef CONFIG_SYS_NAND_HW_ECC
-#define CONFIG_SYS_NAND_HW_ECC_OOBFIRST
 #define CONFIG_SYS_NAND_U_BOOT_SIZE    0x40000
 #define CONFIG_SYS_NAND_U_BOOT_DST     0xc1080000
 #define CONFIG_SYS_NAND_U_BOOT_START   CONFIG_SYS_NAND_U_BOOT_DST

diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 4b24d614e1ad1055ad3c3936b92bcdd90a129536..184360f7e9001b60b23a8928d45a1cdf4aa48250 100644 (file)
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -111,7 +111,6 @@
 #define CONFIG_SYS_NAND_MASK_CLE       0x10
 #define CONFIG_SYS_NAND_MASK_ALE       0x8
 #undef CONFIG_SYS_NAND_HW_ECC
-#define CONFIG_SYS_NAND_HW_ECC_OOBFIRST
 #define CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 #define CONFIG_SYS_NAND_U_BOOT_SIZE    SZ_512K
 #define CONFIG_SYS_NAND_U_BOOT_DST     0xc1080000