Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 6bbb3e93a5eb91d56a66a716acfbfa9ea86bfc4c

Authored by Vladimir Zapolskiy
Committed by Scott Wood
1 parent d3022c5f5c
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, 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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, 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, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

NAND: remove NAND_MAX_CHIPS definitions 

This change follows the change by Wolfgang Grandegger (commit 6c869637fef),
which allows to remove useless NAND_MAX_CHIPS definitions in board config
files.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>

Showing 24 changed files with 2 additions and 31 deletions Side-by-side Diff

include/configs/P1_P2_RDB.h
Diff comments   View file @ 6bbb3e9
... ... @@ -273,11 +273,10 @@
273 273 #endif
274 274 #endif
275 275  
  276 +#define CONFIG_CMD_NAND
276 277 #define CONFIG_SYS_NAND_BASE_LIST {CONFIG_SYS_NAND_BASE}
277 278 #define CONFIG_SYS_MAX_NAND_DEVICE 1
278   -#define NAND_MAX_CHIPS 1
279 279 #define CONFIG_MTD_NAND_VERIFY_WRITE
280   -#define CONFIG_CMD_NAND 1
281 280 #define CONFIG_NAND_FSL_ELBC 1
282 281 #define CONFIG_SYS_NAND_BLOCK_SIZE (16 * 1024)
283 282  
include/configs/SIMPC8313.h
Diff comments   View file @ 6bbb3e9
... ... @@ -144,10 +144,9 @@
144 144 #endif
145 145 #define CONFIG_SYS_FPGA_BASE 0xFF000000
146 146  
  147 +#define CONFIG_CMD_NAND
147 148 #define CONFIG_SYS_MAX_NAND_DEVICE 1
148   -#define NAND_MAX_CHIPS 1
149 149 #define CONFIG_MTD_NAND_VERIFY_WRITE
150   -#define CONFIG_CMD_NAND 1
151 150 #define CONFIG_NAND_FSL_ELBC 1
152 151  
153 152 #define CONFIG_SYS_NAND_BR_PRELIM (CONFIG_SYS_NAND_BASE \
include/configs/VCMA9.h
Diff comments   View file @ 6bbb3e9
... ... @@ -237,7 +237,6 @@
237 237 #define CONFIG_NAND_S3C2410
238 238 #define CONFIG_SYS_S3C2410_NAND_HWECC
239 239 #define CONFIG_SYS_MAX_NAND_DEVICE 1
240   -#define NAND_MAX_CHIPS 1
241 240 #define CONFIG_SYS_NAND_BASE 0x4E000000
242 241 #define CONFIG_S3C24XX_CUSTOM_NAND_TIMING
243 242 #define CONFIG_S3C24XX_TACLS 1
include/configs/aria.h
Diff comments   View file @ 6bbb3e9
... ... @@ -247,13 +247,9 @@
247 247 */
248 248 #define CONFIG_CMD_NAND /* enable NAND support */
249 249 #define CONFIG_JFFS2_NAND /* with JFFS2 on it */
250   -
251   -
252 250 #define CONFIG_NAND_MPC5121_NFC
253 251 #define CONFIG_SYS_NAND_BASE 0x40000000
254   -
255 252 #define CONFIG_SYS_MAX_NAND_DEVICE 1
256   -#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE
257 253  
258 254 /*
259 255 * Configuration parameters for MPC5121 NAND driver
include/configs/bf526-ezbrd.h
Diff comments   View file @ 6bbb3e9
... ... @@ -70,7 +70,6 @@
70 70 #define CONFIG_DRIVER_NAND_BFIN
71 71 #define CONFIG_SYS_NAND_BASE 0 /* not actually used */
72 72 #define CONFIG_SYS_MAX_NAND_DEVICE 1
73   -#define NAND_MAX_CHIPS 1
74 73 #define CONFIG_CMD_NAND
75 74 #endif
76 75  
include/configs/bf527-ad7160-eval.h
Diff comments   View file @ 6bbb3e9
... ... @@ -69,7 +69,6 @@
69 69 #define CONFIG_DRIVER_NAND_BFIN
70 70 #define CONFIG_SYS_NAND_BASE 0 /* not actually used */
71 71 #define CONFIG_SYS_MAX_NAND_DEVICE 1
72   -#define NAND_MAX_CHIPS 1
73 72 #endif
74 73  
75 74  
include/configs/bf527-ezkit.h
Diff comments   View file @ 6bbb3e9
... ... @@ -69,7 +69,6 @@
69 69 #define CONFIG_DRIVER_NAND_BFIN
70 70 #define CONFIG_SYS_NAND_BASE 0 /* not actually used */
71 71 #define CONFIG_SYS_MAX_NAND_DEVICE 1
72   -#define NAND_MAX_CHIPS 1
73 72 #endif
74 73  
75 74  
include/configs/bf548-ezkit.h
Diff comments   View file @ 6bbb3e9
... ... @@ -131,7 +131,6 @@
131 131 #define CONFIG_DRIVER_NAND_BFIN
132 132 #define CONFIG_SYS_NAND_BASE 0 /* not actually used */
133 133 #define CONFIG_SYS_MAX_NAND_DEVICE 1
134   -#define NAND_MAX_CHIPS 1
135 134  
136 135  
137 136 /*
include/configs/cm-bf527.h
Diff comments   View file @ 6bbb3e9
... ... @@ -68,7 +68,6 @@
68 68 #define CONFIG_BFIN_NFC_CTL_VAL 0x0033
69 69 #define CONFIG_SYS_NAND_BASE 0 /* not actually used */
70 70 #define CONFIG_SYS_MAX_NAND_DEVICE 1
71   -#define NAND_MAX_CHIPS 1
72 71 #define CONFIG_CMD_NAND
73 72 #endif
74 73  
include/configs/cpu9260.h
Diff comments   View file @ 6bbb3e9
... ... @@ -295,7 +295,6 @@
295 295  
296 296 /* NAND flash */
297 297 #define CONFIG_NAND_ATMEL
298   -#define NAND_MAX_CHIPS 1
299 298 #define CONFIG_SYS_MAX_NAND_DEVICE 1
300 299 #define CONFIG_SYS_NAND_BASE 0x40000000
301 300 #define CONFIG_SYS_NAND_DBW_8 1
include/configs/da830evm.h
Diff comments   View file @ 6bbb3e9
... ... @@ -115,7 +115,6 @@
115 115 #define CONFIG_SYS_CLE_MASK 0x10
116 116 #define CONFIG_SYS_ALE_MASK 0x8
117 117 #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
118   -#define NAND_MAX_CHIPS 1
119 118 #endif
120 119  
121 120 #ifdef CONFIG_USE_NOR
include/configs/da850evm.h
Diff comments   View file @ 6bbb3e9
... ... @@ -182,7 +182,6 @@
182 182 #define CONFIG_SYS_ALE_MASK 0x8
183 183 #undef CONFIG_SYS_NAND_HW_ECC
184 184 #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
185   -#define NAND_MAX_CHIPS 1
186 185 #endif
187 186  
188 187 /*
include/configs/ea20.h
Diff comments   View file @ 6bbb3e9
... ... @@ -197,7 +197,6 @@
197 197 #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
198 198 #define CONFIG_SYS_NAND_USE_FLASH_BBT
199 199 #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
200   -#define NAND_MAX_CHIPS 1
201 200 #define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
202 201 #endif
203 202  
include/configs/hawkboard.h
Diff comments   View file @ 6bbb3e9
... ... @@ -114,7 +114,6 @@
114 114 /* Max number of NAND devices */
115 115 #define CONFIG_SYS_MAX_NAND_DEVICE 1
116 116 #define CONFIG_SYS_NAND_BASE_LIST { 0x62000000, }
117   -#define NAND_MAX_CHIPS 1
118 117 /* Block 0--not used by bootcode */
119 118 #define CONFIG_ENV_OFFSET 0x0
120 119  
include/configs/km/km_arm.h
Diff comments   View file @ 6bbb3e9
... ... @@ -133,7 +133,6 @@
133 133 * NAND Flash configuration
134 134 */
135 135 #define CONFIG_SYS_MAX_NAND_DEVICE 1
136   -#define NAND_MAX_CHIPS 1
137 136  
138 137 #define BOOTFLASH_START 0x0
139 138  
include/configs/m28evk.h
Diff comments   View file @ 6bbb3e9
... ... @@ -154,7 +154,6 @@
154 154 #define CONFIG_SYS_MAX_NAND_DEVICE 1
155 155 #define CONFIG_SYS_NAND_BASE 0x60000000
156 156 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
157   -#define NAND_MAX_CHIPS 8
158 157  
159 158 /* Environment is in NAND */
160 159 #define CONFIG_ENV_IS_IN_NAND
include/configs/mecp5123.h
Diff comments   View file @ 6bbb3e9
... ... @@ -178,9 +178,7 @@
178 178 #define CONFIG_CMD_NAND
179 179 #define CONFIG_NAND_MPC5121_NFC
180 180 #define CONFIG_SYS_NAND_BASE 0x40000000
181   -
182 181 #define CONFIG_SYS_MAX_NAND_DEVICE 1
183   -#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE
184 182  
185 183 /*
186 184 * Configuration parameters for MPC5121 NAND driver
include/configs/mpc5121ads.h
Diff comments   View file @ 6bbb3e9
... ... @@ -242,7 +242,6 @@
242 242 #define CONFIG_SYS_NAND_BASE 0x40000000
243 243  
244 244 #define CONFIG_SYS_MAX_NAND_DEVICE 2
245   -#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE
246 245 #define CONFIG_SYS_NAND_SELECT_DEVICE /* driver supports mutipl. chips */
247 246  
248 247 /*
include/configs/mv-common.h
Diff comments   View file @ 6bbb3e9
... ... @@ -132,7 +132,6 @@
132 132 */
133 133 #ifdef CONFIG_CMD_NAND
134 134 #define CONFIG_SYS_MAX_NAND_DEVICE 1
135   -#define NAND_MAX_CHIPS 1
136 135 #define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
137 136 #endif
138 137  
include/configs/pdm360ng.h
Diff comments   View file @ 6bbb3e9
... ... @@ -225,9 +225,7 @@
225 225 #define CONFIG_CMD_NAND /* enable NAND support */
226 226 #define CONFIG_NAND_MPC5121_NFC
227 227 #define CONFIG_SYS_NAND_BASE 0x40000000
228   -
229 228 #define CONFIG_SYS_MAX_NAND_DEVICE 1
230   -#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE
231 229 #define CONFIG_SYS_NAND_SELECT_DEVICE /* driver supports mutipl. chips */
232 230  
233 231 /*
include/configs/pm9261.h
Diff comments   View file @ 6bbb3e9
... ... @@ -233,7 +233,6 @@
233 233  
234 234 /* NAND flash */
235 235 #define CONFIG_NAND_ATMEL
236   -#define NAND_MAX_CHIPS 1
237 236 #define CONFIG_SYS_MAX_NAND_DEVICE 1
238 237 #define CONFIG_SYS_NAND_BASE 0x40000000
239 238 #define CONFIG_SYS_NAND_DBW_8 1
include/configs/qi_lb60.h
Diff comments   View file @ 6bbb3e9
... ... @@ -117,7 +117,6 @@
117 117 #define CONFIG_SYS_NAND_OOBSIZE 128
118 118 #define CONFIG_SYS_NAND_BASE 0xB8000000
119 119 #define CONFIG_SYS_ONENAND_BASE CONFIG_SYS_NAND_BASE
120   -#define NAND_MAX_CHIPS 1
121 120 #define CONFIG_SYS_MAX_NAND_DEVICE 1
122 121 #define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl.*/
123 122 #define CONFIG_NAND_SPL_TEXT_BASE 0x80000000
include/configs/smdk2410.h
Diff comments   View file @ 6bbb3e9
... ... @@ -211,7 +211,6 @@
211 211 #define CONFIG_NAND_S3C2410
212 212 #define CONFIG_SYS_S3C2410_NAND_HWECC
213 213 #define CONFIG_SYS_MAX_NAND_DEVICE 1
214   -#define NAND_MAX_CHIPS 1
215 214 #define CONFIG_SYS_NAND_BASE 0x4E000000
216 215 #endif
217 216  
include/configs/tnetv107x_evm.h
Diff comments   View file @ 6bbb3e9
... ... @@ -90,7 +90,6 @@
90 90 #define CONFIG_CMD_MTDPARTS
91 91 #define CONFIG_MTD_DEVICE
92 92 #define CONFIG_JFFS2_NAND
93   -#define NAND_MAX_CHIPS 1
94 93 #define CONFIG_ENV_OFFSET 0x180000
95 94  
96 95 /*