Home Explore Help
Sign In
coolsoul
/
u-boot
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Convert CONFIG_NAND_DAVINCI to Kconfig

This converts the following to Kconfig:
   CONFIG_NAND_DAVINCI

Signed-off-by: Adam Ford <aford173@gmail.com>
Adam Ford 6 years ago
parent
e7db856bf9
commit
eba7f1ff6c
18 changed files with 27 additions and 6 deletions
Unified View Show Diff Stats
  1. 2 0
      configs/ea20_defconfig
  2. 2 0
      configs/ipam390_defconfig
  3. 2 0
      configs/k2e_evm_defconfig
  4. 2 0
      configs/k2e_hs_evm_defconfig
  5. 2 0
      configs/k2g_evm_defconfig
  6. 2 0
      configs/k2g_hs_evm_defconfig
  7. 2 0
      configs/k2hk_evm_defconfig
  8. 2 0
      configs/k2hk_hs_evm_defconfig
  9. 2 0
      configs/k2l_evm_defconfig
  10. 2 0
      configs/k2l_hs_evm_defconfig
  11. 1 0
      configs/omapl138_lcdk_defconfig
  12. 6 0
      drivers/mtd/nand/Kconfig
  13. 0 1
      include/configs/da850evm.h
  14. 0 1
      include/configs/ea20.h
  15. 0 1
      include/configs/ipam390.h
  16. 0 1
      include/configs/omapl138_lcdk.h
  17. 0 1
      include/configs/ti_armv7_keystone2.h
  18. 0 1
      scripts/config_whitelist.txt

+ 2 - 0
configs/ea20_defconfig
View File 

@@ -30,6 +30,8 @@ CONFIG_CMD_DIAG=y
 
 CONFIG_CMD_UBI=y
 
 CONFIG_CMD_UBI=y
 
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 
 # CONFIG_MMC is not set
 
 # CONFIG_MMC is not set
 
+CONFIG_NAND=y
 
+CONFIG_NAND_DAVINCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_SYS_NS16550=y

+ 2 - 0
configs/ipam390_defconfig
View File 

@@ -34,4 +34,6 @@ CONFIG_CMD_DIAG=y
 
 CONFIG_CMD_UBI=y
 
 CONFIG_CMD_UBI=y
 
 CONFIG_ENV_IS_IN_NAND=y
 
 CONFIG_ENV_IS_IN_NAND=y
 
 # CONFIG_MMC is not set
 
 # CONFIG_MMC is not set
 
+CONFIG_NAND=y
 
+CONFIG_NAND_DAVINCI=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_SYS_NS16550=y

+ 2 - 0
configs/k2e_evm_defconfig
View File 

@@ -36,6 +36,8 @@ CONFIG_NET_RANDOM_ETHADDR=y
 
 CONFIG_DM=y
 
 CONFIG_DM=y
 
 CONFIG_TI_AEMIF=y
 
 CONFIG_TI_AEMIF=y
 
 # CONFIG_MMC is not set
 
 # CONFIG_MMC is not set
 
+CONFIG_NAND=y
 
+CONFIG_NAND_DAVINCI=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_STMICRO=y

+ 2 - 0
configs/k2e_hs_evm_defconfig
View File 

@@ -29,6 +29,8 @@ CONFIG_NET_RANDOM_ETHADDR=y
 
 CONFIG_DM=y
 
 CONFIG_DM=y
 
 CONFIG_TI_AEMIF=y
 
 CONFIG_TI_AEMIF=y
 
 # CONFIG_MMC is not set
 
 # CONFIG_MMC is not set
 
+CONFIG_NAND=y
 
+CONFIG_NAND_DAVINCI=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_STMICRO=y

+ 2 - 0
configs/k2g_evm_defconfig
View File 

@@ -36,6 +36,8 @@ CONFIG_DM=y
 
 # CONFIG_BLK is not set
 
 # CONFIG_BLK is not set
 
 CONFIG_DM_MMC=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_MMC_OMAP_HS=y
 
 CONFIG_MMC_OMAP_HS=y
 
+CONFIG_NAND=y
 
+CONFIG_NAND_DAVINCI=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y

+ 2 - 0
configs/k2g_hs_evm_defconfig
View File 

@@ -29,6 +29,8 @@ CONFIG_DM=y
 
 # CONFIG_BLK is not set
 
 # CONFIG_BLK is not set
 
 CONFIG_DM_MMC=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_MMC_OMAP_HS=y
 
 CONFIG_MMC_OMAP_HS=y
 
+CONFIG_NAND=y
 
+CONFIG_NAND_DAVINCI=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y

+ 2 - 0
configs/k2hk_evm_defconfig
View File 

@@ -36,6 +36,8 @@ CONFIG_NET_RANDOM_ETHADDR=y
 
 CONFIG_DM=y
 
 CONFIG_DM=y
 
 CONFIG_TI_AEMIF=y
 
 CONFIG_TI_AEMIF=y
 
 # CONFIG_MMC is not set
 
 # CONFIG_MMC is not set
 
+CONFIG_NAND=y
 
+CONFIG_NAND_DAVINCI=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_STMICRO=y

+ 2 - 0
configs/k2hk_hs_evm_defconfig
View File 

@@ -29,6 +29,8 @@ CONFIG_NET_RANDOM_ETHADDR=y
 
 CONFIG_DM=y
 
 CONFIG_DM=y
 
 CONFIG_TI_AEMIF=y
 
 CONFIG_TI_AEMIF=y
 
 # CONFIG_MMC is not set
 
 # CONFIG_MMC is not set
 
+CONFIG_NAND=y
 
+CONFIG_NAND_DAVINCI=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_STMICRO=y

+ 2 - 0
configs/k2l_evm_defconfig
View File 

@@ -36,6 +36,8 @@ CONFIG_NET_RANDOM_ETHADDR=y
 
 CONFIG_DM=y
 
 CONFIG_DM=y
 
 CONFIG_TI_AEMIF=y
 
 CONFIG_TI_AEMIF=y
 
 # CONFIG_MMC is not set
 
 # CONFIG_MMC is not set
 
+CONFIG_NAND=y
 
+CONFIG_NAND_DAVINCI=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_STMICRO=y

+ 2 - 0
configs/k2l_hs_evm_defconfig
View File 

@@ -28,6 +28,8 @@ CONFIG_NET_RANDOM_ETHADDR=y
 
 CONFIG_DM=y
 
 CONFIG_DM=y
 
 CONFIG_TI_AEMIF=y
 
 CONFIG_TI_AEMIF=y
 
 # CONFIG_MMC is not set
 
 # CONFIG_MMC is not set
 
+CONFIG_NAND=y
 
+CONFIG_NAND_DAVINCI=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_STMICRO=y

+ 1 - 0
configs/omapl138_lcdk_defconfig
View File 

@@ -35,6 +35,7 @@ CONFIG_DM=y
 
 CONFIG_DM_I2C=y
 
 CONFIG_DM_I2C=y
 
 CONFIG_DM_I2C_COMPAT=y
 
 CONFIG_DM_I2C_COMPAT=y
 
 CONFIG_NAND=y
 
 CONFIG_NAND=y
 
+CONFIG_NAND_DAVINCI=y
 
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000
 
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000

+ 6 - 0
drivers/mtd/nand/Kconfig
View File 

@@ -16,6 +16,12 @@ config NAND_ATMEL
 
 	  Enable this driver for NAND flash platforms using an Atmel NAND
 
 	  Enable this driver for NAND flash platforms using an Atmel NAND
 
 	  controller.
 
 	  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
 
 config NAND_DENALI
 
 	bool
 
 	bool
 
 	select SYS_NAND_SELF_INIT
 
 	select SYS_NAND_SELF_INIT

+ 0 - 1
include/configs/da850evm.h
View File 

@@ -149,7 +149,6 @@
 
  * Flash & Environment
 
  * Flash & Environment
 
  */
 
  */
 
 #ifdef CONFIG_USE_NAND
 
 #ifdef CONFIG_USE_NAND
 
-#define CONFIG_NAND_DAVINCI
 
 #define CONFIG_ENV_OFFSET		0x0 /* Block 0--not used by bootcode */
 
 #define CONFIG_ENV_OFFSET		0x0 /* Block 0--not used by bootcode */
 
 #define CONFIG_ENV_SIZE			(128 << 10)
 
 #define CONFIG_ENV_SIZE			(128 << 10)
 
 #define	CONFIG_SYS_NAND_USE_FLASH_BBT
 
 #define	CONFIG_SYS_NAND_USE_FLASH_BBT

+ 0 - 1
include/configs/ea20.h
View File 

@@ -116,7 +116,6 @@
 
 #define CONFIG_MTD_DEVICE
 
 #define CONFIG_MTD_DEVICE
 
 #define CONFIG_MTD_PARTITIONS
 
 #define CONFIG_MTD_PARTITIONS
 
 
 
-#define CONFIG_NAND_DAVINCI
 
 #define	CONFIG_SYS_NAND_PAGE_2K
 
 #define	CONFIG_SYS_NAND_PAGE_2K
 
 #define CONFIG_SYS_NAND_NO_SUBPAGE
 
 #define CONFIG_SYS_NAND_NO_SUBPAGE
 
 #define CONFIG_SYS_NAND_CS		2
 
 #define CONFIG_SYS_NAND_CS		2

+ 0 - 1
include/configs/ipam390.h
View File 

@@ -117,7 +117,6 @@
 
 /*
 
 /*
 
  * Flash & Environment
 
  * Flash & Environment
 
  */
 
  */
 
-#define CONFIG_NAND_DAVINCI
 
 #define CONFIG_ENV_OFFSET		0x0 /* Block 0--not used by bootcode */
 
 #define CONFIG_ENV_OFFSET		0x0 /* Block 0--not used by bootcode */
 
 #define CONFIG_ENV_SIZE			(128 << 10)
 
 #define CONFIG_ENV_SIZE			(128 << 10)
 
 #define	CONFIG_SYS_NAND_USE_FLASH_BBT
 
 #define	CONFIG_SYS_NAND_USE_FLASH_BBT

+ 0 - 1
include/configs/omapl138_lcdk.h
View File 

@@ -143,7 +143,6 @@
 
  * Flash & Environment
 
  * Flash & Environment
 
  */
 
  */
 
 #ifdef CONFIG_USE_NAND
 
 #ifdef CONFIG_USE_NAND
 
-#define CONFIG_NAND_DAVINCI
 
 #define CONFIG_ENV_OFFSET		0x0 /* Block 0--not used by bootcode */
 
 #define CONFIG_ENV_OFFSET		0x0 /* Block 0--not used by bootcode */
 
 #define CONFIG_ENV_SIZE			(128 << 9)
 
 #define CONFIG_ENV_SIZE			(128 << 9)
 
 #define	CONFIG_SYS_NAND_USE_FLASH_BBT
 
 #define	CONFIG_SYS_NAND_USE_FLASH_BBT

+ 0 - 1
include/configs/ti_armv7_keystone2.h
View File 

@@ -159,7 +159,6 @@
 
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 
 
 
 /* NAND Configuration */
 
 /* NAND Configuration */
 
-#define CONFIG_NAND_DAVINCI
 
 #define CONFIG_KEYSTONE_RBL_NAND
 
 #define CONFIG_KEYSTONE_RBL_NAND
 
 #define CONFIG_KEYSTONE_NAND_MAX_RBL_SIZE	CONFIG_ENV_OFFSET
 
 #define CONFIG_KEYSTONE_NAND_MAX_RBL_SIZE	CONFIG_ENV_OFFSET
 
 #define CONFIG_SYS_NAND_MASK_CLE		0x4000
 
 #define CONFIG_SYS_NAND_MASK_CLE		0x4000

+ 0 - 1
scripts/config_whitelist.txt
View File 

@@ -1369,7 +1369,6 @@ CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 
 CONFIG_NAND_ACTL
 
 CONFIG_NAND_ACTL
 
 CONFIG_NAND_CS_INIT
 
 CONFIG_NAND_CS_INIT
 
 CONFIG_NAND_DATA_REG
 
 CONFIG_NAND_DATA_REG
 
-CONFIG_NAND_DAVINCI
 
 CONFIG_NAND_ECC_BCH
 
 CONFIG_NAND_ECC_BCH
 
 CONFIG_NAND_ENV_DST
 
 CONFIG_NAND_ENV_DST
 
 CONFIG_NAND_FSL_ELBC
 
 CONFIG_NAND_FSL_ELBC