Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit eba7f1ff6c9836931f0ce2812182190862e38b5f

Authored by Adam Ford
Committed by Tom Rini
1 parent e7db856bf9
Exists in smarc_8mq_lf_v2020.04 and in 11 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

Convert CONFIG_NAND_DAVINCI to Kconfig 

This converts the following to Kconfig:
   CONFIG_NAND_DAVINCI

Signed-off-by: Adam Ford <aford173@gmail.com>

Showing 18 changed files with 27 additions and 6 deletions Side-by-side Diff

configs/ea20_defconfig
Diff comments   View file @ eba7f1f
... ... @@ -30,6 +30,8 @@
30 30 CONFIG_CMD_UBI=y
31 31 CONFIG_ENV_IS_IN_SPI_FLASH=y
32 32 # CONFIG_MMC is not set
  33 +CONFIG_NAND=y
  34 +CONFIG_NAND_DAVINCI=y
33 35 CONFIG_SPI_FLASH=y
34 36 CONFIG_SPI_FLASH_STMICRO=y
35 37 CONFIG_SYS_NS16550=y
configs/ipam390_defconfig
Diff comments   View file @ eba7f1f
... ... @@ -34,5 +34,7 @@
34 34 CONFIG_CMD_UBI=y
35 35 CONFIG_ENV_IS_IN_NAND=y
36 36 # CONFIG_MMC is not set
  37 +CONFIG_NAND=y
  38 +CONFIG_NAND_DAVINCI=y
37 39 CONFIG_SYS_NS16550=y
configs/k2e_evm_defconfig
Diff comments   View file @ eba7f1f
... ... @@ -36,6 +36,8 @@
36 36 CONFIG_DM=y
37 37 CONFIG_TI_AEMIF=y
38 38 # CONFIG_MMC is not set
  39 +CONFIG_NAND=y
  40 +CONFIG_NAND_DAVINCI=y
39 41 CONFIG_DM_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH=y
41 43 CONFIG_SPI_FLASH_STMICRO=y
configs/k2e_hs_evm_defconfig
Diff comments   View file @ eba7f1f
... ... @@ -29,6 +29,8 @@
29 29 CONFIG_DM=y
30 30 CONFIG_TI_AEMIF=y
31 31 # CONFIG_MMC is not set
  32 +CONFIG_NAND=y
  33 +CONFIG_NAND_DAVINCI=y
32 34 CONFIG_DM_SPI_FLASH=y
33 35 CONFIG_SPI_FLASH=y
34 36 CONFIG_SPI_FLASH_STMICRO=y
configs/k2g_evm_defconfig
Diff comments   View file @ eba7f1f
... ... @@ -36,6 +36,8 @@
36 36 # CONFIG_BLK is not set
37 37 CONFIG_DM_MMC=y
38 38 CONFIG_MMC_OMAP_HS=y
  39 +CONFIG_NAND=y
  40 +CONFIG_NAND_DAVINCI=y
39 41 CONFIG_DM_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH=y
41 43 CONFIG_SPI_FLASH_BAR=y
configs/k2g_hs_evm_defconfig
Diff comments   View file @ eba7f1f
... ... @@ -29,6 +29,8 @@
29 29 # CONFIG_BLK is not set
30 30 CONFIG_DM_MMC=y
31 31 CONFIG_MMC_OMAP_HS=y
  32 +CONFIG_NAND=y
  33 +CONFIG_NAND_DAVINCI=y
32 34 CONFIG_DM_SPI_FLASH=y
33 35 CONFIG_SPI_FLASH=y
34 36 CONFIG_SPI_FLASH_BAR=y
configs/k2hk_evm_defconfig
Diff comments   View file @ eba7f1f
... ... @@ -36,6 +36,8 @@
36 36 CONFIG_DM=y
37 37 CONFIG_TI_AEMIF=y
38 38 # CONFIG_MMC is not set
  39 +CONFIG_NAND=y
  40 +CONFIG_NAND_DAVINCI=y
39 41 CONFIG_DM_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH=y
41 43 CONFIG_SPI_FLASH_STMICRO=y
configs/k2hk_hs_evm_defconfig
Diff comments   View file @ eba7f1f
... ... @@ -29,6 +29,8 @@
29 29 CONFIG_DM=y
30 30 CONFIG_TI_AEMIF=y
31 31 # CONFIG_MMC is not set
  32 +CONFIG_NAND=y
  33 +CONFIG_NAND_DAVINCI=y
32 34 CONFIG_DM_SPI_FLASH=y
33 35 CONFIG_SPI_FLASH=y
34 36 CONFIG_SPI_FLASH_STMICRO=y
configs/k2l_evm_defconfig
Diff comments   View file @ eba7f1f
... ... @@ -36,6 +36,8 @@
36 36 CONFIG_DM=y
37 37 CONFIG_TI_AEMIF=y
38 38 # CONFIG_MMC is not set
  39 +CONFIG_NAND=y
  40 +CONFIG_NAND_DAVINCI=y
39 41 CONFIG_DM_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH=y
41 43 CONFIG_SPI_FLASH_STMICRO=y
configs/k2l_hs_evm_defconfig
Diff comments   View file @ eba7f1f
... ... @@ -28,6 +28,8 @@
28 28 CONFIG_DM=y
29 29 CONFIG_TI_AEMIF=y
30 30 # CONFIG_MMC is not set
  31 +CONFIG_NAND=y
  32 +CONFIG_NAND_DAVINCI=y
31 33 CONFIG_DM_SPI_FLASH=y
32 34 CONFIG_SPI_FLASH=y
33 35 CONFIG_SPI_FLASH_STMICRO=y
configs/omapl138_lcdk_defconfig
Diff comments   View file @ eba7f1f
... ... @@ -35,6 +35,7 @@
35 35 CONFIG_DM_I2C=y
36 36 CONFIG_DM_I2C_COMPAT=y
37 37 CONFIG_NAND=y
  38 +CONFIG_NAND_DAVINCI=y
38 39 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
39 40 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
40 41 CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000
drivers/mtd/nand/Kconfig
Diff comments   View file @ eba7f1f
... ... @@ -16,6 +16,12 @@
16 16 Enable this driver for NAND flash platforms using an Atmel NAND
17 17 controller.
18 18  
  19 +config NAND_DAVINCI
  20 + bool "Support TI Davinci NAND controller"
  21 + help
  22 + Enable this driver for NAND flash controllers available in TI Davinci
  23 + and Keystone2 platforms
  24 +
19 25 config NAND_DENALI
20 26 bool
21 27 select SYS_NAND_SELF_INIT
include/configs/da850evm.h
Diff comments   View file @ eba7f1f
... ... @@ -149,7 +149,6 @@
149 149 * Flash & Environment
150 150 */
151 151 #ifdef CONFIG_USE_NAND
152   -#define CONFIG_NAND_DAVINCI
153 152 #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
154 153 #define CONFIG_ENV_SIZE (128 << 10)
155 154 #define CONFIG_SYS_NAND_USE_FLASH_BBT
include/configs/ea20.h
Diff comments   View file @ eba7f1f
... ... @@ -116,7 +116,6 @@
116 116 #define CONFIG_MTD_DEVICE
117 117 #define CONFIG_MTD_PARTITIONS
118 118  
119   -#define CONFIG_NAND_DAVINCI
120 119 #define CONFIG_SYS_NAND_PAGE_2K
121 120 #define CONFIG_SYS_NAND_NO_SUBPAGE
122 121 #define CONFIG_SYS_NAND_CS 2
include/configs/ipam390.h
Diff comments   View file @ eba7f1f
... ... @@ -117,7 +117,6 @@
117 117 /*
118 118 * Flash & Environment
119 119 */
120   -#define CONFIG_NAND_DAVINCI
121 120 #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
122 121 #define CONFIG_ENV_SIZE (128 << 10)
123 122 #define CONFIG_SYS_NAND_USE_FLASH_BBT
include/configs/omapl138_lcdk.h
Diff comments   View file @ eba7f1f
... ... @@ -143,7 +143,6 @@
143 143 * Flash & Environment
144 144 */
145 145 #ifdef CONFIG_USE_NAND
146   -#define CONFIG_NAND_DAVINCI
147 146 #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
148 147 #define CONFIG_ENV_SIZE (128 << 9)
149 148 #define CONFIG_SYS_NAND_USE_FLASH_BBT
include/configs/ti_armv7_keystone2.h
Diff comments   View file @ eba7f1f
... ... @@ -159,7 +159,6 @@
159 159 #define CONFIG_ENV_EEPROM_IS_ON_I2C
160 160  
161 161 /* NAND Configuration */
162   -#define CONFIG_NAND_DAVINCI
163 162 #define CONFIG_KEYSTONE_RBL_NAND
164 163 #define CONFIG_KEYSTONE_NAND_MAX_RBL_SIZE CONFIG_ENV_OFFSET
165 164 #define CONFIG_SYS_NAND_MASK_CLE 0x4000
scripts/config_whitelist.txt
Diff comments   View file @ eba7f1f
... ... @@ -1369,7 +1369,6 @@
1369 1369 CONFIG_NAND_ACTL
1370 1370 CONFIG_NAND_CS_INIT
1371 1371 CONFIG_NAND_DATA_REG
1372   -CONFIG_NAND_DAVINCI
1373 1372 CONFIG_NAND_ECC_BCH
1374 1373 CONFIG_NAND_ENV_DST
1375 1374 CONFIG_NAND_FSL_ELBC