Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 942556a92a8c1eb1bd76584a5143f6f57dcb25ad

Authored by Stefan Roese
Committed by Wolfgang Denk
1 parent 8d2effea23
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

mtd: MTD related config header changes (mtdparts command) 

By changing the cmd_mtdparts to only use the MTD infrastructure and
not the direct interface to the CFI NOR FLASH driver we now need
to add the MTD infrastructure to all boards using those mtdparts
commands. This patch adds those components:

CONFIG_MTD_DEVICE (for all FLASH types)

plus

CONFIG_FLASH_CFI_MTD (for NOR FLASH)

To all board maintainers: Please test this on your platforms and
report any problems/issues found. Thanks.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Ron Madrid <info@sheldoninst.com>
Cc: Georg Schardt <schardt@team-ctech.de>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Ladislav Michl <ladis@linux-mips.org>
Cc: Martin Krause <martin.krause@tqs.de>
Cc: Gary Jennejohn <garyj@denx.de>
Cc: Ricardo Ribalda <ricardo.ribalda@uam.es>

Showing 35 changed files with 66 additions and 0 deletions Side-by-side Diff

include/configs/BC3450.h
Diff comments   View file @ 942556a
... ... @@ -347,6 +347,8 @@
347 347  
348 348 /* Dynamic MTD partition support */
349 349 #define CONFIG_CMD_MTDPARTS
  350 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  351 +#define CONFIG_FLASH_CFI_MTD
350 352 #define MTDIDS_DEFAULT "nor0=TQM5200-0"
351 353 #define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:640k(firmware)," \
352 354 "1408k(kernel)," \
include/configs/FPS850L.h
Diff comments   View file @ 942556a
... ... @@ -217,6 +217,8 @@
217 217 * Dynamic MTD partition support
218 218 */
219 219 #define CONFIG_CMD_MTDPARTS
  220 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  221 +#define CONFIG_FLASH_CFI_MTD
220 222 #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
221 223  
222 224 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
include/configs/FPS860L.h
Diff comments   View file @ 942556a
... ... @@ -217,6 +217,8 @@
217 217 * Dynamic MTD partition support
218 218 */
219 219 #define CONFIG_CMD_MTDPARTS
  220 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  221 +#define CONFIG_FLASH_CFI_MTD
220 222 #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
221 223  
222 224 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
include/configs/SIMPC8313.h
Diff comments   View file @ 942556a
... ... @@ -190,6 +190,7 @@
190 190  
191 191 /* mtdparts command line support */
192 192 #define CONFIG_CMD_MTDPARTS
  193 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
193 194 #define MTDIDS_DEFAULT "nand0=nand0"
194 195 #define MTDPARTS_DEFAULT "mtdparts=nand0:2M(u-boot),6M(kernel),-(jffs2)"
195 196  
include/configs/TB5200.h
Diff comments   View file @ 942556a
... ... @@ -276,6 +276,8 @@
276 276  
277 277 /* Dynamic MTD partition support */
278 278 #define CONFIG_CMD_MTDPARTS
  279 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  280 +#define CONFIG_FLASH_CFI_MTD
279 281 #define MTDIDS_DEFAULT "nor0=TQM5200-0"
280 282 #if defined(CONFIG_TQM5200_B)
281 283 #define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:768k(firmware)," \
include/configs/TQM5200.h
Diff comments   View file @ 942556a
... ... @@ -408,6 +408,8 @@
408 408  
409 409 /* Dynamic MTD partition support */
410 410 #define CONFIG_CMD_MTDPARTS
  411 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  412 +#define CONFIG_FLASH_CFI_MTD
411 413 #define MTDIDS_DEFAULT "nor0=TQM5200-0"
412 414  
413 415 #ifdef CONFIG_STK52XX
include/configs/TQM823L.h
Diff comments   View file @ 942556a
... ... @@ -232,6 +232,8 @@
232 232 * Dynamic MTD partition support
233 233 */
234 234 #define CONFIG_CMD_MTDPARTS
  235 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  236 +#define CONFIG_FLASH_CFI_MTD
235 237 #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
236 238  
237 239 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
include/configs/TQM823M.h
Diff comments   View file @ 942556a
... ... @@ -228,6 +228,8 @@
228 228 * Dynamic MTD partition support
229 229 */
230 230 #define CONFIG_CMD_MTDPARTS
  231 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  232 +#define CONFIG_FLASH_CFI_MTD
231 233 #define MTDIDS_DEFAULT "nor0=TQM8xxM-0"
232 234  
233 235 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \
include/configs/TQM834x.h
Diff comments   View file @ 942556a
... ... @@ -534,6 +534,8 @@
534 534 */
535 535 /* mtdparts command line support */
536 536 #define CONFIG_CMD_MTDPARTS
  537 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  538 +#define CONFIG_FLASH_CFI_MTD
537 539 #define MTDIDS_DEFAULT "nor0=TQM834x-0"
538 540  
539 541 /* default mtd partition table */
include/configs/TQM850L.h
Diff comments   View file @ 942556a
... ... @@ -217,6 +217,8 @@
217 217 * Dynamic MTD partition support
218 218 */
219 219 #define CONFIG_CMD_MTDPARTS
  220 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  221 +#define CONFIG_FLASH_CFI_MTD
220 222 #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
221 223  
222 224 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
include/configs/TQM850M.h
Diff comments   View file @ 942556a
... ... @@ -217,6 +217,8 @@
217 217 * Dynamic MTD partition support
218 218 */
219 219 #define CONFIG_CMD_MTDPARTS
  220 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  221 +#define CONFIG_FLASH_CFI_MTD
220 222 #define MTDIDS_DEFAULT "nor0=TQM8xxM-0"
221 223  
222 224 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \
include/configs/TQM855L.h
Diff comments   View file @ 942556a
... ... @@ -222,6 +222,8 @@
222 222 * Dynamic MTD partition support
223 223 */
224 224 #define CONFIG_CMD_MTDPARTS
  225 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  226 +#define CONFIG_FLASH_CFI_MTD
225 227 #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
226 228  
227 229 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
include/configs/TQM855M.h
Diff comments   View file @ 942556a
... ... @@ -257,6 +257,8 @@
257 257 * Dynamic MTD partition support
258 258 */
259 259 #define CONFIG_CMD_MTDPARTS
  260 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  261 +#define CONFIG_FLASH_CFI_MTD
260 262 #define MTDIDS_DEFAULT "nor0=TQM8xxM-0"
261 263  
262 264 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \
include/configs/TQM85xx.h
Diff comments   View file @ 942556a
... ... @@ -567,6 +567,8 @@
567 567 #define CONFIG_JFFS2_NAND 1
568 568  
569 569 #ifdef CONFIG_CMD_MTDPARTS
  570 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  571 +#define CONFIG_FLASH_CFI_MTD
570 572 #define MTDIDS_DEFAULT "nand0=TQM85xx-nand"
571 573 #define MTDPARTS_DEFAULT "mtdparts=TQM85xx-nand:-"
572 574 #else
include/configs/TQM860L.h
Diff comments   View file @ 942556a
... ... @@ -221,6 +221,8 @@
221 221 * Dynamic MTD partition support
222 222 */
223 223 #define CONFIG_CMD_MTDPARTS
  224 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  225 +#define CONFIG_FLASH_CFI_MTD
224 226 #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
225 227  
226 228 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
include/configs/TQM860M.h
Diff comments   View file @ 942556a
... ... @@ -222,6 +222,8 @@
222 222 * Dynamic MTD partition support
223 223 */
224 224 #define CONFIG_CMD_MTDPARTS
  225 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  226 +#define CONFIG_FLASH_CFI_MTD
225 227 #define MTDIDS_DEFAULT "nor0=TQM8xxM-0"
226 228  
227 229 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \
include/configs/TQM862L.h
Diff comments   View file @ 942556a
... ... @@ -225,6 +225,8 @@
225 225 * Dynamic MTD partition support
226 226 */
227 227 #define CONFIG_CMD_MTDPARTS
  228 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  229 +#define CONFIG_FLASH_CFI_MTD
228 230 #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
229 231  
230 232 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
include/configs/TQM862M.h
Diff comments   View file @ 942556a
... ... @@ -226,6 +226,8 @@
226 226 * Dynamic MTD partition support
227 227 */
228 228 #define CONFIG_CMD_MTDPARTS
  229 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  230 +#define CONFIG_FLASH_CFI_MTD
229 231 #define MTDIDS_DEFAULT "nor0=TQM8xxM-0"
230 232  
231 233 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \
include/configs/TQM866M.h
Diff comments   View file @ 942556a
... ... @@ -266,6 +266,8 @@
266 266 * Dynamic MTD partition support
267 267 */
268 268 #define CONFIG_CMD_MTDPARTS
  269 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  270 +#define CONFIG_FLASH_CFI_MTD
269 271 #define MTDIDS_DEFAULT "nor0=TQM8xxM-0"
270 272  
271 273 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \
include/configs/apollon.h
Diff comments   View file @ 942556a
... ... @@ -124,6 +124,7 @@
124 124 #define CONFIG_CMD_JFFS2
125 125 #define CONFIG_CMD_UBI
126 126 #define CONFIG_RBTREE
  127 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
127 128 #define CONFIG_MTD_PARTITIONS
128 129 #endif
129 130  
include/configs/cm5200.h
Diff comments   View file @ 942556a
... ... @@ -223,6 +223,8 @@
223 223 * MTD configuration
224 224 */
225 225 #define CONFIG_CMD_MTDPARTS 1
  226 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  227 +#define CONFIG_FLASH_CFI_MTD
226 228 #define MTDIDS_DEFAULT "nor0=cm5200-0"
227 229 #define MTDPARTS_DEFAULT "mtdparts=cm5200-0:" \
228 230 "384k(uboot),128k(env)," \
include/configs/fx12mm.h
Diff comments   View file @ 942556a
... ... @@ -38,6 +38,8 @@
38 38 /* cmd config */
39 39 #define CONFIG_CMD_JFFS2
40 40 #define CONFIG_CMD_MTDPARTS
  41 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  42 +#define CONFIG_FLASH_CFI_MTD
41 43 #undef CONFIG_CMD_NET
42 44  
43 45 /* sdram */
include/configs/idmr.h
Diff comments   View file @ 942556a
... ... @@ -230,6 +230,8 @@
230 230  
231 231 /* Dynamic MTD partition support */
232 232 #define CONFIG_CMD_MTDPARTS
  233 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  234 +#define CONFIG_FLASH_CFI_MTD
233 235 #define MTDIDS_DEFAULT "nor0=idmr-0"
234 236  
235 237 #define MTDPARTS_DEFAULT "mtdparts=idmr-0:128k(u-boot)," \
include/configs/microblaze-generic.h
Diff comments   View file @ 942556a
... ... @@ -260,6 +260,8 @@
260 260 #if defined(CONFIG_CMD_JFFS2)
261 261 /* JFFS2 partitions */
262 262 #define CONFIG_CMD_MTDPARTS /* mtdparts command line support */
  263 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  264 +#define CONFIG_FLASH_CFI_MTD
263 265 #define MTDIDS_DEFAULT "nor0=ml401-0"
264 266  
265 267 /* default mtd partition table */
include/configs/motionpro.h
Diff comments   View file @ 942556a
... ... @@ -276,6 +276,8 @@
276 276 * MTD configuration
277 277 */
278 278 #define CONFIG_CMD_MTDPARTS
  279 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  280 +#define CONFIG_FLASH_CFI_MTD
279 281 #define MTDIDS_DEFAULT "nor0=motionpro-0"
280 282 #define MTDPARTS_DEFAULT "mtdparts=motionpro-0:" \
281 283 "13m(fs),2m(kernel),256k(uboot)," \
include/configs/mx1fs2.h
Diff comments   View file @ 942556a
... ... @@ -183,6 +183,8 @@
183 183 /* mtdparts command line support */
184 184 /* Note: fake mtd_id used, no linux mtd map file */
185 185 #define CONFIG_CMD_MTDPARTS
  186 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  187 +#define CONFIG_FLASH_CFI_MTD
186 188 #define MTDIDS_DEFAULT "nor0=mx1fs2-0"
187 189  
188 190 #ifdef BUS32BIT_VERSION
include/configs/netstar.h
Diff comments   View file @ 942556a
... ... @@ -130,6 +130,8 @@
130 130 * partitions (mtdparts command line support)
131 131 */
132 132 #define CONFIG_CMD_MTDPARTS
  133 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  134 +#define CONFIG_FLASH_CFI_MTD
133 135 #define MTDIDS_DEFAULT "nor0=omapflash.0,nand0=omapnand.0"
134 136 #define MTDPARTS_DEFAULT "mtdparts=" \
135 137 "omapflash.0:8k@16k(env),8k(r_env),448k@576k(u-boot);" \
include/configs/omap3_beagle.h
Diff comments   View file @ 942556a
... ... @@ -105,6 +105,7 @@
105 105 #define CONFIG_CMD_FAT /* FAT support */
106 106 #define CONFIG_CMD_JFFS2 /* JFFS2 Support */
107 107 #define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
  108 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
108 109 #define MTDIDS_DEFAULT "nand0=nand"
109 110 #define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
110 111 "1920k(u-boot),128k(u-boot-env),"\
include/configs/qong.h
Diff comments   View file @ 942556a
... ... @@ -213,6 +213,8 @@
213 213 * JFFS2 partitions
214 214 */
215 215 #define CONFIG_CMD_MTDPARTS
  216 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  217 +#define CONFIG_FLASH_CFI_MTD
216 218 #define MTDIDS_DEFAULT "nor0=physmap-flash.0"
217 219 #define MTDPARTS_DEFAULT \
218 220 "mtdparts=physmap-flash.0:256k(U-Boot),128k(env1)," \
include/configs/smmaco4.h
Diff comments   View file @ 942556a
... ... @@ -215,6 +215,8 @@
215 215  
216 216 /* Dynamic MTD partition support */
217 217 #define CONFIG_CMD_MTDPARTS
  218 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  219 +#define CONFIG_FLASH_CFI_MTD
218 220 #define MTDIDS_DEFAULT "nor0=TQM5200-0"
219 221 #define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:640k(firmware)," \
220 222 "1408k(kernel)," \
include/configs/trab.h
Diff comments   View file @ 942556a
... ... @@ -375,6 +375,8 @@
375 375  
376 376 /* Dynamic MTD partition support */
377 377 #define CONFIG_CMD_MTDPARTS
  378 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  379 +#define CONFIG_FLASH_CFI_MTD
378 380 #define MTDIDS_DEFAULT "nor0=0"
379 381  
380 382 /* production flash layout */
include/configs/vct.h
Diff comments   View file @ 942556a
... ... @@ -296,6 +296,7 @@
296 296 #define CONFIG_CMD_JFFS2
297 297 #define CONFIG_CMD_UBI
298 298 #define CONFIG_RBTREE
  299 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
299 300 #define CONFIG_MTD_PARTITIONS
300 301 #define CONFIG_CMD_MTDPARTS
301 302  
include/configs/virtlab2.h
Diff comments   View file @ 942556a
... ... @@ -226,6 +226,8 @@
226 226 * Dynamic MTD partition support
227 227 */
228 228 #define CONFIG_CMD_MTDPARTS
  229 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  230 +#define CONFIG_FLASH_CFI_MTD
229 231 #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
230 232  
231 233 #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
include/configs/voiceblue.h
Diff comments   View file @ 942556a
... ... @@ -190,6 +190,8 @@
190 190 * JFFS2 partitions (mtdparts command line support)
191 191 */
192 192 #define CONFIG_CMD_MTDPARTS
  193 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  194 +#define CONFIG_FLASH_CFI_MTD
193 195 #define MTDIDS_DEFAULT "nor0=omapflash.0"
194 196 #define MTDPARTS_DEFAULT "mtdparts=omapflash.0:256k(u-boot),64k(env),64k(r_env),16192k(data0),-(data1)"
195 197  
include/configs/xilinx-ppc.h
Diff comments   View file @ 942556a
... ... @@ -109,6 +109,8 @@
109 109 #define CONFIG_SYS_FLASH_PROTECTION
110 110 #define CONFIG_CMD_JFFS2
111 111 #define CONFIG_CMD_MTDPARTS
  112 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
  113 +#define CONFIG_FLASH_CFI_MTD
112 114 #else
113 115 #define CONFIG_ENV_IS_NOWHERE
114 116 #define CONFIG_SYS_NO_FLASH