diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig index 497e551..43292a1 100644 --- a/configs/ea20_defconfig +++ b/configs/ea20_defconfig @@ -30,6 +30,8 @@ CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_DAVINCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig index 15c4944..d1a6e54 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -34,4 +34,6 @@ CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_DAVINCI=y CONFIG_SYS_NS16550=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index 3307839..c5bb84a 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -36,6 +36,8 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/k2e_hs_evm_defconfig b/configs/k2e_hs_evm_defconfig index ef6abc8..a86eeb8 100644 --- a/configs/k2e_hs_evm_defconfig +++ b/configs/k2e_hs_evm_defconfig @@ -29,6 +29,8 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_DAVINCI=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 ede8f6a..911618c 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -36,6 +36,8 @@ CONFIG_DM=y # CONFIG_BLK is not set CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND=y +CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig index 04f4b02..174af79 100644 --- a/configs/k2g_hs_evm_defconfig +++ b/configs/k2g_hs_evm_defconfig @@ -29,6 +29,8 @@ CONFIG_DM=y # CONFIG_BLK is not set CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND=y +CONFIG_NAND_DAVINCI=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 fa800f5..942e44e 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -36,6 +36,8 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/k2hk_hs_evm_defconfig b/configs/k2hk_hs_evm_defconfig index 2cf5c4f..12be37f 100644 --- a/configs/k2hk_hs_evm_defconfig +++ b/configs/k2hk_hs_evm_defconfig @@ -29,6 +29,8 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_DAVINCI=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 1034d36..5381e9f 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -36,6 +36,8 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/k2l_hs_evm_defconfig b/configs/k2l_hs_evm_defconfig index d369d32..0381a72 100644 --- a/configs/k2l_hs_evm_defconfig +++ b/configs/k2l_hs_evm_defconfig @@ -28,6 +28,8 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index cabea06..4a97269 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -35,6 +35,7 @@ CONFIG_DM=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y CONFIG_NAND=y +CONFIG_NAND_DAVINCI=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000 diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 8175fbb..1e4ea7b 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -16,6 +16,12 @@ config NAND_ATMEL Enable this driver for NAND flash platforms using an Atmel NAND controller. +config NAND_DAVINCI + bool "Support TI Davinci NAND controller" + help + Enable this driver for NAND flash controllers available in TI Davinci + and Keystone2 platforms + config NAND_DENALI bool select SYS_NAND_SELF_INIT diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index ebfdd1c..006cd03 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -149,7 +149,6 @@ * Flash & Environment */ #ifdef CONFIG_USE_NAND -#define CONFIG_NAND_DAVINCI #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 10) #define CONFIG_SYS_NAND_USE_FLASH_BBT diff --git a/include/configs/ea20.h b/include/configs/ea20.h index ee122ad..2112431 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -116,7 +116,6 @@ #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS -#define CONFIG_NAND_DAVINCI #define CONFIG_SYS_NAND_PAGE_2K #define CONFIG_SYS_NAND_NO_SUBPAGE #define CONFIG_SYS_NAND_CS 2 diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 08978fa..c5171e0 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -117,7 +117,6 @@ /* * Flash & Environment */ -#define CONFIG_NAND_DAVINCI #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 10) #define CONFIG_SYS_NAND_USE_FLASH_BBT diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 879c8a0..f34e35e 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -143,7 +143,6 @@ * Flash & Environment */ #ifdef CONFIG_USE_NAND -#define CONFIG_NAND_DAVINCI #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 9) #define CONFIG_SYS_NAND_USE_FLASH_BBT diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index ccd4665..18a03b3 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -159,7 +159,6 @@ #define CONFIG_ENV_EEPROM_IS_ON_I2C /* NAND Configuration */ -#define CONFIG_NAND_DAVINCI #define CONFIG_KEYSTONE_RBL_NAND #define CONFIG_KEYSTONE_NAND_MAX_RBL_SIZE CONFIG_ENV_OFFSET #define CONFIG_SYS_NAND_MASK_CLE 0x4000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e92f97e..d6d4fb9 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1369,7 +1369,6 @@ CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC CONFIG_NAND_ACTL CONFIG_NAND_CS_INIT CONFIG_NAND_DATA_REG -CONFIG_NAND_DAVINCI CONFIG_NAND_ECC_BCH CONFIG_NAND_ENV_DST CONFIG_NAND_FSL_ELBC