This converts the following to Kconfig: CONFIG_SYS_NAND_HW_ECC_OOBFIRST
Signed-off-by: Tom Rini trini@konsulko.com --- README | 4 ---- configs/da850evm_nand_defconfig | 1 + configs/omapl138_lcdk_defconfig | 1 + drivers/mtd/nand/raw/Kconfig | 5 +++++ include/configs/da850evm.h | 1 - include/configs/omapl138_lcdk.h | 1 - 6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/README b/README index d75c3fbc8596..4309d9338664 100644 --- 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 30454a3787a9..84563b2a3c7f 100644 --- 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 51c78dc51ad5..a067c0177940 100644 --- 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 48a7507c643b..49b7a4b04bb4 100644 --- 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 262a79be015c..abf5db934c50 100644 --- 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 4b24d614e1ad..184360f7e900 100644 --- 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