There is already an entry in Kconfig with 'CONFIG_' prepended.
This patch renames them to match CONFIG_MTDIDS_DEFAULT and
CONFIG_MTDPARTS_DEFAULT to make the migration to Kconfig easier
in the future.
Signed-off-by: Adam Ford <aford...@gmail.com>
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 19c772c..fa872b8 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -325,8 +325,8 @@ extern unsigned long get_sdram_size(void);
*/
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nand0=ff800000.flash,"
-#define MTDPARTS_DEFAULT "mtdparts=ff800000.flash:1m(uboot)," \
+#define CONFIG_MTDIDS_DEFAULT "nand0=ff800000.flash,"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=ff800000.flash:1m(uboot)," \
"8m(kernel),512k(dtb),-(fs)"
/*
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 92ff88b..a62498c 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -544,8 +544,8 @@ combinations. this should be removed later
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=88000000.nor,nand0=ff800000.flash,"
-#define MTDPARTS_DEFAULT "mtdparts=88000000.nor:256k(dtb),7m(kernel)," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=88000000.nor,nand0=ff800000.flash,"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=88000000.nor:256k(dtb),7m(kernel)," \
"55m(fs),1m(uboot);ff800000.flash:1m(uboot)," \
"8m(kernel),512k(dtb),-(fs)"
#endif
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 66a17f2..71bb72f 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -305,9 +305,9 @@
#define CONFIG_JFFS2_DEV "nand0"
#define CONFIG_JFFS2_PART_OFFSET (0x800000)
#define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT "nand0=m54418twr.nand"
+#define CONFIG_MTDIDS_DEFAULT "nand0=m54418twr.nand"
-#define MTDPARTS_DEFAULT "mtdparts=m54418twr.nand:1m(data)," \
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=m54418twr.nand:1m(data),"
\
"7m(kernel)," \
"-(rootfs)"
@@ -316,8 +316,8 @@
#ifdef CONFIG_CMD_UBI
#define CONFIG_MTD_DEVICE /* needed for mtdparts command */
#define CONFIG_MTD_PARTITIONS /* mtdparts and UBI support */
-#define MTDIDS_DEFAULT "nand0=NAND"
-#define MTDPARTS_DEFAULT "mtdparts=NAND:1m(u-boot)," \
+#define CONFIG_MTDIDS_DEFAULT "nand0=NAND"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=NAND:1m(u-boot)," \
"-(ubi)"
#endif
/* Cache Configuration */
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 3a031a8..7add27a 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -259,8 +259,8 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITION
-#define MTDIDS_DEFAULT "nand0=e2800000.flash"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nand0=e2800000.flash"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=e2800000.flash:512k(uboot),128k(env),6m@1m(kernel),-(fs)"
#define CONFIG_SYS_MAX_NAND_DEVICE 1
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index e2cc815..dd58b28 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -235,8 +235,8 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITION
-#define MTDIDS_DEFAULT "nand0=e0600000.flash"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nand0=e0600000.flash"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=e0600000.flash:512k(uboot),128k(env),6m@1m(kernel),-(fs)"
#define CONFIG_SYS_MAX_NAND_DEVICE 1
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index c19339b..beca7ee 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -352,8 +352,8 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITION
-#define MTDIDS_DEFAULT "nand0=ff800000.flash"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nand0=ff800000.flash"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
#define CONFIG_SYS_NAND_CSPR (CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 8c83f2d..d86aa30 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -533,13 +533,13 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
#ifdef CONFIG_PHYS_64BIT
-#define MTDIDS_DEFAULT "nor0=fe8000000.nor"
-#define MTDPARTS_DEFAULT "mtdparts=fe8000000.nor:48m(ramdisk)," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=fe8000000.nor"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=fe8000000.nor:48m(ramdisk)," \
"14m(diagnostic),2m(dink),6m(kernel),58112k(fs)," \
"512k(dtb),768k(u-boot)"
#else
-#define MTDIDS_DEFAULT "nor0=e8000000.nor"
-#define MTDPARTS_DEFAULT "mtdparts=e8000000.nor:48m(ramdisk)," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=e8000000.nor"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=e8000000.nor:48m(ramdisk)," \
"14m(diagnostic),2m(dink),6m(kernel),58112k(fs)," \
"512k(dtb),768k(u-boot)"
#endif
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index d58af7b..a0512b5 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -752,9 +752,9 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
"spi0=spife110000.0"
-#define MTDPARTS_DEFAULT "mtdparts=fe8000000.nor:1m(uboot),5m(kernel)," \
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=fe8000000.nor:1m(uboot),5m(kernel)," \
"128k(dtb),96m(fs),-(user);"\
"fff800000.flash:2m(uboot),9m(kernel),"\
"128k(dtb),96m(fs),-(user);spife110000.0:" \
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index c94b837..c00c98e 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -764,9 +764,9 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
"spi0=spife110000.1"
-#define MTDPARTS_DEFAULT "mtdparts=fe8000000.nor:1m(uboot),5m(kernel)," \
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=fe8000000.nor:1m(uboot),5m(kernel),"
\
"128k(dtb),96m(fs),-(user);fff800000.flash:1m(uboot)," \
"5m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:" \
"1m(uboot),5m(kernel),128k(dtb),-(user)"
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 98cee8a..a385d50 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -631,9 +631,9 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
"spi0=spife110000.0"
-#define MTDPARTS_DEFAULT "mtdparts=fe8000000.nor:1m(uboot),5m(kernel)," \
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=fe8000000.nor:1m(uboot),5m(kernel)," \
"128k(dtb),96m(fs),-(user);"\
"fff800000.flash:2m(uboot),9m(kernel),"\
"128k(dtb),96m(fs),-(user);spife110000.0:" \
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index a54e17c..e917f20 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -796,9 +796,9 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
"spi0=spife110000.0"
-#define MTDPARTS_DEFAULT "mtdparts=fe8000000.nor:1m(uboot),5m(kernel)," \
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=fe8000000.nor:1m(uboot),5m(kernel)," \
"128k(dtb),96m(fs),-(user);"\
"fff800000.flash:2m(uboot),9m(kernel),"\
"128k(dtb),96m(fs),-(user);spife110000.0:" \
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index c1c3fa1..d43f410 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -718,9 +718,9 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
"spi0=spife110000.0"
-#define MTDPARTS_DEFAULT "mtdparts=fe8000000.nor:1m(uboot),5m(kernel)," \
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=fe8000000.nor:1m(uboot),5m(kernel),"
\
"128k(dtb),96m(fs),-(user);fff800000.flash:1m(uboot)," \
"5m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:" \
"1m(uboot),5m(kernel),128k(dtb),-(user)"
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 803d8fb..ce411fc 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -666,9 +666,9 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
"spi0=spife110000.1"
-#define MTDPARTS_DEFAULT "mtdparts=fe8000000.nor:1m(uboot),5m(kernel)," \
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=fe8000000.nor:1m(uboot),5m(kernel),"
\
"128k(dtb),96m(fs),-(user);fff800000.flash:1m(uboot)," \
"5m(kernel),128k(dtb),96m(fs),-(user);spife110000.1:" \
"1m(uboot),5m(kernel),128k(dtb),-(user)"
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 45c54a0..9a93b7f 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -503,10 +503,10 @@
/* mtdparts command line support */
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=TQM834x-0"
+#define CONFIG_MTDIDS_DEFAULT "nor0=TQM834x-0"
/* default mtd partition table */
-#define MTDPARTS_DEFAULT "mtdparts=TQM834x-0:256k(u-boot),256k(env)," \
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=TQM834x-0:256k(u-boot),256k(env)," \
"1m(kernel),2m(initrd)," \
"-(user);" \
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 415ce46..0fa76ad 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -38,8 +38,8 @@
#ifdef CONFIG_NAND
#define NANDARGS \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"nandargs=setenv bootargs console=${console} " \
"${optargs} " \
"root=${nandroot} " \
@@ -218,8 +218,8 @@
#define CONFIG_SYS_NAND_ECCBYTES 14
#define CONFIG_SYS_NAND_ONFI_DETECTION
#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW
-#define MTDIDS_DEFAULT "nand0=nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=nand.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand.0:" \
"128k(NAND.SPL)," \
"128k(NAND.SPL.backup1)," \
"128k(NAND.SPL.backup2)," \
@@ -313,8 +313,8 @@
#define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */
#define CONFIG_ENV_OFFSET (768 << 10) /* 768 KiB in */
#define CONFIG_ENV_OFFSET_REDUND (896 << 10) /* 896 KiB in */
-#define MTDIDS_DEFAULT "nor0=m25p80-flash.0"
-#define MTDPARTS_DEFAULT "mtdparts=m25p80-flash.0:128k(SPL)," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=m25p80-flash.0"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=m25p80-flash.0:128k(SPL)," \
"512k(u-boot),128k(u-boot-env1)," \
"128k(u-boot-env2),3464k(kernel)," \
"-(rootfs)"
@@ -329,8 +329,8 @@
#define CONFIG_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET (512 << 10) /* 512 KiB */
#define CONFIG_ENV_OFFSET_REDUND (768 << 10) /* 768 KiB */
-#define MTDIDS_DEFAULT "nor0=physmap-flash.0"
-#define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nor0=physmap-flash.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:" \
"512k(u-boot)," \
"128k(u-boot-env1)," \
"128k(u-boot-env2)," \
diff --git a/include/configs/am335x_igep003x.h
b/include/configs/am335x_igep003x.h
index 9b14603..77d3107 100644
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -63,8 +63,8 @@
"bootz ${loadaddr} - ${fdtaddr};" \
"fi;" \
"fi;\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"nandroot=ubi0:rootfs rw ubi.mtd=1\0" \
"nandrootfstype=ubifs rootwait\0" \
"nandload=ubi part UBI; " \
@@ -119,8 +119,8 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
+#define CONFIG_MTDIDS_DEFAULT "nand0=omap2-nand.0"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
/* SPL */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index e7ef3dd..e1afb13 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -144,8 +144,8 @@
* DTB 4 * NAND_BLOCK_SIZE = 512 KiB @ 0xAA0000
* RootFS Remaining Flash Space @ 0xB20000
*/
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=omap2-nand.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:" \
"512k(MLO)," \
"1920k(u-boot)," \
"256k(u-boot-env)," \
@@ -153,8 +153,8 @@
"512k(dtb)," \
"-(rootfs)"
#else
-#define MTDIDS_DEFAULT
-#define MTDPARTS_DEFAULT
+#define CONFIG_MTDIDS_DEFAULT
+#define CONFIG_MTDPARTS_DEFAULT
#endif /* CONFIG_NAND */
/* Environment information */
@@ -170,8 +170,8 @@
"bootenv=uEnv.txt\0" \
"cmdline=\0" \
"optargs=\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"mmcdev=0\0" \
"mmcpart=1\0" \
"mmcroot=/dev/mmcblk0p2 rw\0" \
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index b84f6e3..51f1735 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -124,13 +124,13 @@
#define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64 KB sectors */
#define CONFIG_ENV_OFFSET 0x110000
#define CONFIG_ENV_OFFSET_REDUND 0x120000
-#ifdef MTDIDS_DEFAULT
-#undef MTDIDS_DEFAULT
+#ifdef CONFIG_MTDIDS_DEFAULT
+#undef CONFIG_MTDIDS_DEFAULT
#endif
-#ifdef MTDPARTS_DEFAULT
-#undef MTDPARTS_DEFAULT
+#ifdef CONFIG_MTDPARTS_DEFAULT
+#undef CONFIG_MTDPARTS_DEFAULT
#endif
-#define MTDPARTS_DEFAULT "mtdparts=qspi.0:512k(QSPI.u-boot)," \
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=qspi.0:512k(QSPI.u-boot)," \
"512k(QSPI.u-boot.backup)," \
"512k(QSPI.u-boot-spl-os)," \
"64k(QSPI.u-boot-env)," \
@@ -285,8 +285,8 @@
}
#define CONFIG_SYS_NAND_ECCSIZE 512
#define CONFIG_SYS_NAND_ECCBYTES 26
-#define MTDIDS_DEFAULT "nand0=nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=nand.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand.0:" \
"256k(NAND.SPL)," \
"256k(NAND.SPL.backup1)," \
"256k(NAND.SPL.backup2)," \
@@ -307,8 +307,8 @@
#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00300000 /* kernel offset */
#endif
#define NANDARGS \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"nandargs=setenv bootargs console=${console} " \
"${optargs} " \
"root=${nandroot} " \
diff --git a/include/configs/ap121.h b/include/configs/ap121.h
index 860f385..ebb9f29 100644
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -31,8 +31,8 @@
"mtdparts default;" \
"bootm 0x9f650000"
-#define MTDIDS_DEFAULT "nor0=spi-flash.0"
-#define MTDPARTS_DEFAULT "mtdparts=spi-flash.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nor0=spi-flash.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=spi-flash.0:" \
"256k(u-boot),64k(u-boot-env)," \
"6144k(rootfs),1600k(uImage)," \
"64k(NVRAM),64k(ART)"
diff --git a/include/configs/ap143.h b/include/configs/ap143.h
index 068007e..20b9baf 100644
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -35,8 +35,8 @@
"mtdparts default;" \
"bootm 0x9f680000"
-#define MTDIDS_DEFAULT "nor0=spi-flash.0"
-#define MTDPARTS_DEFAULT "mtdparts=spi-flash.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nor0=spi-flash.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=spi-flash.0:" \
"256k(u-boot),64k(u-boot-env)," \
"6336k(rootfs),1472k(uImage)," \
"64k(ART)"
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 12bb085..4542997 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -88,8 +88,8 @@
#define CONFIG_ROOTFS_OFFSET 0x00800000
#define CONFIG_MTDMAP "mxc_nand.0"
-#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
-#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP \
+#define CONFIG_MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP \
":1M(u-boot)ro," \
"512K(env)," \
"512K(env2)," \
@@ -138,7 +138,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" __stringify(CONFIG_ENV_VERSION) "\0" \
"consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"partition=nand0,6\0" \
"u-boot_addr=" __stringify(ACFG_MONITOR_OFFSET) "\0" \
"env_addr=" __stringify(CONFIG_ENV_OFFSET) "\0" \
diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index bb68125..3cb9a62 100644
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -49,11 +49,11 @@
#ifdef CONFIG_CMD_NAND
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nand0=gpmi-nand"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=gpmi-nand:128k(bootstrap),1024k(boot),768k(env),-(root)"
#else
-#define MTDPARTS_DEFAULT ""
+#define CONFIG_MTDPARTS_DEFAULT ""
#endif
/* FEC Ethernet on SoC */
@@ -80,7 +80,7 @@
/* Extra Environments */
#define CONFIG_EXTRA_ENV_SETTINGS \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"verify=no\0" \
"bootcmd=run bootcmd_nand\0" \
"kernelargs=console=tty0 console=ttyAMA0,115200 consoleblank=0\0" \
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 089b865..aa2ce3d 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -82,15 +82,15 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT "nand0=atmel_nand"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nand0=atmel_nand"
+#define CONFIG_MTDPARTS_DEFAULT
\
"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \
"256k(env),256k(env_redundant),256k(spare)," \
"512k(dtb),6M(kernel)ro,-(rootfs)"
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \
- "mtdparts="MTDPARTS_DEFAULT"\0" \
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0"
\
"bootargs_nand=rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\0"\
"bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0"
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 185c749..46955f0 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -48,8 +48,8 @@
#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */
#endif
#define NANDARGS \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"nandargs=setenv bootargs console=${console} " \
"${optargs} " \
"${mtdparts} " \
@@ -307,8 +307,8 @@
#ifdef CONFIG_NAND
#define GPMC_NAND_ECC_LP_x8_LAYOUT 1
#if !defined(CONFIG_SPI_BOOT) && !defined(CONFIG_NOR_BOOT)
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:128k(SPL)," \
+#define CONFIG_MTDIDS_DEFAULT "nand0=omap2-nand.0"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=omap2-nand.0:128k(SPL)," \
"128k(SPL.backup1)," \
"128k(SPL.backup2)," \
"128k(SPL.backup3)," \
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 062c99c..3e305fa 100644
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -39,8 +39,8 @@
#ifdef CONFIG_NAND
#define NANDARGS \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"nandargs=setenv bootargs console=${console} " \
"${optargs} " \
"root=${nandroot} " \
@@ -371,8 +371,8 @@ DEFAULT_LINUX_BOOT_ENV \
#define CONFIG_SYS_NAND_ECCBYTES 14
#define CONFIG_SYS_NAND_ONFI_DETECTION
#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW
-#define MTDIDS_DEFAULT "nand0=nand.0"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand.0"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=nand.0:" \
"128k(NAND.SPL)," \
"128k(NAND.SPL.backup1)," \
@@ -489,8 +489,8 @@ DEFAULT_LINUX_BOOT_ENV \
#define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */
#define CONFIG_ENV_OFFSET (768 << 10) /* 768 KiB in */
#define CONFIG_ENV_OFFSET_REDUND (896 << 10) /* 896 KiB in */
-#define MTDIDS_DEFAULT "nor0=m25p80-flash.0"
-#define MTDPARTS_DEFAULT "mtdparts=m25p80-flash.0:128k(SPL)," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=m25p80-flash.0"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=m25p80-flash.0:128k(SPL)," \
"512k(u-boot),128k(u-boot-env1)," \
"128k(u-boot-env2),3464k(kernel)," \
"-(rootfs)"
@@ -537,8 +537,8 @@ DEFAULT_LINUX_BOOT_ENV \
#define CONFIG_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET (512 << 10) /* 512 KiB */
#define CONFIG_ENV_OFFSET_REDUND (768 << 10) /* 768 KiB */
-#define MTDIDS_DEFAULT "nor0=physmap-flash.0"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nor0=physmap-flash.0"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=physmap-flash.0:" \
"512k(u-boot)," \
"128k(u-boot-env1)," \
diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h
index 5861eeb..3662eac 100644
--- a/include/configs/bk4r1.h
+++ b/include/configs/bk4r1.h
@@ -19,8 +19,8 @@
#define PCM052_NET_INIT "run set_gpio122; "
/* add NOR to MTD env */
-#define MTDIDS_DEFAULT "nand0=NAND,nor0=NOR"
-#define MTDPARTS_DEFAULT "mtdparts=NAND:640k(bootloader)"\
+#define CONFIG_MTDIDS_DEFAULT "nand0=NAND,nor0=NOR"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=NAND:640k(bootloader)"\
",128k(env1)"\
",128k(env2)"\
",128k(dtb)"\
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 07a173f..14e135a 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -84,8 +84,8 @@
#ifdef CONFIG_NAND
#define NANDARGS \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"nandargs=setenv bootargs console=${console} " \
"${optargs} " \
"${optargs_rot} " \
@@ -209,8 +209,8 @@ MMCARGS
#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=omap2-nand.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:" \
"128k(MLO)," \
"128k(MLO.backup)," \
"128k(dtb)," \
diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index b7887d9..0f5883d 100644
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -20,8 +20,8 @@
#define V_SCLK (V_OSCK)
#define NANDARGS \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"nandargs=setenv bootargs console=${console} ${optargs} " \
"${mtdparts} " \
"root=${nandroot} " \
@@ -151,8 +151,8 @@
#define CONFIG_SYS_NAND_ECCBYTES 14
#define CONFIG_SYS_NAND_ONFI_DETECTION
#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW
-#define MTDIDS_DEFAULT "nand0=8000000.nand"
-#define MTDPARTS_DEFAULT "mtdparts=8000000.nand:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=8000000.nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=8000000.nand:" \
"128k(NAND.SPL)," \
"128k(NAND.SPL.backup1)," \
"128k(NAND.SPL.backup2)," \
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 4f45be1..0a1e973 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -57,8 +57,8 @@
#define CONFIG_SPI_FLASH_MTD
#endif
-#define MTDIDS_DEFAULT "nor0=spi0.0"
-#define MTDPARTS_DEFAULT "mtdparts=spi0.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nor0=spi0.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=spi0.0:" \
"768k(uboot)," \
"256k(uboot-environment)," \
"-(reserved)"
@@ -92,8 +92,8 @@
"video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \
"doboot=bootm ${loadaddr}\0" \
"doloadfdt=false\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"setboottypez=setenv kernel ${zImage};" \
"setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
"setenv doloadfdt true;\0" \
diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index 2287d5b..fb78678 100644
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -43,8 +43,8 @@
"bootm ${loadaddr}\0"
#define NANDARGS \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"nandroot=ubi0:rootfs rw\0" \
"nandrootfstype=ubifs\0" \
"nandargs=setenv bootargs console=${console} " \
@@ -125,8 +125,8 @@
#undef CONFIG_SYS_NAND_U_BOOT_OFFS
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000
-#define MTDIDS_DEFAULT "nand0=nand"
-#define MTDPARTS_DEFAULT "mtdparts=nand:2m(spl)," \
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand:2m(spl)," \
"1m(u-boot),1m(u-boot-env)," \
"1m(dtb),4m(splash)," \
"6m(kernel),-(rootfs)"
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index e0f5765..db7252e 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -85,8 +85,8 @@
/* commands to include */
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nand0=nand"
-#define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
"1920k(u-boot),256k(u-boot-env),"\
"4m(kernel),-(fs)"
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 3a9fd2a..9695a4f 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -93,8 +93,8 @@
/* commands to include */
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nand0=nand"
-#define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
"1920k(u-boot),256k(u-boot-env),"\
"4m(kernel),-(fs)"
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 30a2d12..9907b9f 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -105,7 +105,7 @@
"m4boot=;\0" \
"ip_dyn=yes\0" \
"kernel_file=zImage\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
"00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
"${board}/flash_eth.img && source ${loadaddr}\0" \
@@ -170,8 +170,8 @@
/* Dynamic MTD partition support */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=gpmi-nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=gpmi-nand:" \
"512k(mx7-bcb)," \
"1536k(u-boot1)ro," \
"1536k(u-boot2)ro," \
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index c1d4b62..f63bb87 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -47,8 +47,8 @@
/* Dynamic MTD partition support */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT "nand0=tegra_nand"
-#define MTDPARTS_DEFAULT "mtdparts=tegra_nand:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=tegra_nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=tegra_nand:" \
"2m(u-boot)ro," \
"1m(u-boot-env)," \
"1m(cfgblock)ro," \
@@ -60,7 +60,7 @@
#define CONFIG_ENV_SIZE (SZ_64K)
#define BOARD_EXTRA_ENV_SETTINGS \
- "mtdparts=" MTDPARTS_DEFAULT "\0"
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
/* Increase console I/O buffer size */
#undef CONFIG_SYS_CBSIZE
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index cc1f919..6859323 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -50,8 +50,8 @@
/* Dynamic MTD partition support */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT "nand0=vf610_nfc"
-#define MTDPARTS_DEFAULT "mtdparts=vf610_nfc:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=vf610_nfc"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=vf610_nfc:" \
"128k(vf-bcb)ro," \
"1408k(u-boot)ro," \
"512k(u-boot-env)," \
@@ -129,7 +129,7 @@
"fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
"source ${loadaddr}\0" \
"setupdate=run setsdupdate || run setusbupdate\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \
"video-mode=dcufb:640x480-16@60,monitor=lcd\0" \
"splashpos=m,m\0" \
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 2bf0983..e5b5b94 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -67,8 +67,8 @@
#define CONFIG_TWL4030_LED 1
/* Board NAND Info */
-#define MTDIDS_DEFAULT "nand0=nand"
-#define MTDPARTS_DEFAULT "mtdparts=nand:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand:" \
"512k(x-loader)," \
"1920k(u-boot)," \
"128k(u-boot-env)," \
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index f816685..3cb37a9 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -82,9 +82,9 @@
/*
* Default environment variables
*/
-#define MTDIDS_DEFAULT "nand0=orion_nand"
+#define CONFIG_MTDIDS_DEFAULT "nand0=orion_nand"
-#define MTDPARTS_DEFAULT "mtdparts=orion_nand:" \
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=orion_nand:" \
"896k(u-boot),128k(u-boot-env),5m(kernel),-(rootfs)\0"
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -94,7 +94,7 @@
"loadaddr=0x800000\0" \
"autoload=no\0" \
"console=ttyS0,115200\0" \
- "mtdparts="MTDPARTS_DEFAULT \
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT \
"optargs=\0" \
"bootenv=uEnv.txt\0" \
"importbootenv=echo Importing environment ...; " \
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 6c0fc35..7edf928 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -180,8 +180,8 @@
50, 51, 52, 53, 54, 55, 56, 57, }
#define CONFIG_SYS_NAND_ECCSIZE 512
#define CONFIG_SYS_NAND_ECCBYTES 14
-#define MTDIDS_DEFAULT "nand0=nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=nand.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand.0:" \
"128k(NAND.SPL)," \
"128k(NAND.SPL.backup1)," \
"128k(NAND.SPL.backup2)," \
@@ -221,8 +221,8 @@
/* Reduce SPL size by removing unlikey targets */
#ifdef CONFIG_NOR_BOOT
#define CONFIG_ENV_SECT_SIZE (128 * 1024) /* 128 KiB */
-#define MTDIDS_DEFAULT "nor0=physmap-flash.0"
-#define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nor0=physmap-flash.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:" \
"128k(NOR.SPL)," \
"128k(NOR.SPL.backup1)," \
"128k(NOR.SPL.backup2)," \
diff --git a/include/configs/draco.h b/include/configs/draco.h
index 2d8cf93..fab1f58 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -49,7 +49,7 @@
#define CONFIG_ENV_SIZE_REDUND 0x2000
#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
-#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V2
+#define CONFIG_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT_V2
#ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h
index 3d7a168..c8ed363 100644
--- a/include/configs/eco5pk.h
+++ b/include/configs/eco5pk.h
@@ -34,10 +34,10 @@
/*
* Set its own mtdparts, different from common
*/
-#undef MTDIDS_DEFAULT
-#undef MTDPARTS_DEFAULT
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(xloader-nand)," \
+#undef CONFIG_MTDIDS_DEFAULT
+#undef CONFIG_MTDPARTS_DEFAULT
+#define CONFIG_MTDIDS_DEFAULT "nand0=omap2-nand.0"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=omap2-nand.0:512k(xloader-nand)," \
"1024k(uboot-nand),256k(params-nand)," \
"5120k(kernel),-(ubifs)"
@@ -51,7 +51,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_TAM3517_SETTINGS \
"install_kernel=if dhcp $bootfile; then nand erase kernel;" \
"nand write $fileaddr kernel; fi\0" \
- "mtdparts="MTDPARTS_DEFAULT"\0" \
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0" \
"serverip=192.168.142.60\0"
#endif /* __CONFIG_H */
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index c9584ad..7ec6007 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -142,11 +142,11 @@
#undef MTDIDS_NAME_STR
#define MTDIDS_NAME_STR "omap2-nand_concat"
-#undef MTDIDS_DEFAULT
-#define MTDIDS_DEFAULT "nand2=" MTDIDS_NAME_STR
+#undef CONFIG_MTDIDS_DEFAULT
+#define CONFIG_MTDIDS_DEFAULT "nand2=" MTDIDS_NAME_STR
-#undef MTDPARTS_DEFAULT_V2
-#define MTDPARTS_DEFAULT_V2 "mtdparts=" MTDIDS_NAME_STR ":" \
+#undef CONFIG_MTDPARTS_DEFAULT_V2
+#define CONFIG_MTDPARTS_DEFAULT_V2 "mtdparts=" MTDIDS_NAME_STR ":" \
"512k(spl)," \
"512k(spl.backup1)," \
"512k(spl.backup2)," \
@@ -157,8 +157,8 @@
"2048k(mtdoops)," \
"-(rootfs)"
-#undef MTDPARTS_DEFAULT
-#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V2
+#undef CONFIG_MTDPARTS_DEFAULT
+#define CONFIG_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT_V2
#undef CONFIG_ENV_SETTINGS_NAND_V2
#define CONFIG_ENV_SETTINGS_NAND_V2 \
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index ecd35e9..5719910 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -153,8 +153,8 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#if defined(CONFIG_CMD_MTDPARTS) || defined(CONFIG_CMD_NAND)
-#define MTDIDS_DEFAULT "nand0=atmel_nand"
-#define MTDPARTS_DEFAULT "mtdparts=atmel_nand:-(root)"
+#define CONFIG_MTDIDS_DEFAULT "nand0=atmel_nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=atmel_nand:-(root)"
#endif
/* Boot command */
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 5e5d044..ba645f4 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -121,8 +121,8 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_FLASH_CFI_MTD
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nand0=mxc_nand,nor0=physmap-flash.0"
-#define MTDPARTS_DEFAULT "mtdparts=mxc_nand:50m(root1)," \
+#define CONFIG_MTDIDS_DEFAULT "nand0=mxc_nand,nor0=physmap-flash.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=mxc_nand:50m(root1)," \
"32m(rootfb)," \
"64m(pcache)," \
"64m(app1)," \
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index c69e899..e9a13e2 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -66,9 +66,9 @@
"fdt=/boot/guruplug-server-plus.dtb\0" \
"bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
-#define MTDIDS_DEFAULT "nand0=orion_nand"
+#define CONFIG_MTDIDS_DEFAULT "nand0=orion_nand"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts="CONFIG_MTDPARTS
/*
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 0ef78cb..5ff4663 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -196,12 +196,12 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#ifdef CONFIG_SPI_FLASH
-#define MTDIDS_DEFAULT "nor0=nor"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nor0=nor"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=nor:512k(uboot),64k(env),2m(kernel),-(rootfs)"
#else
-#define MTDIDS_DEFAULT "nand0=nand"
-#define MTDPARTS_DEFAULT "mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
#endif
/* Persistent Environment Config */
@@ -240,8 +240,8 @@
"hwconfig=_UNKNOWN_\0" \
"video=\0" \
\
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
"disk=0\0" \
"part=1\0" \
\
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 0c22ca8..4bef4ad 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -475,8 +475,8 @@
/* mtdparts command line support */
#define CONFIG_FLASH_CFI_MTD
#define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT "nor0=ff800000.flash,nand0=e1000000.flash"
-#define MTDPARTS_DEFAULT "mtdparts=ff800000.flash:7m(dum)," \
+#define CONFIG_MTDIDS_DEFAULT
"nor0=ff800000.flash,nand0=e1000000.flash"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=ff800000.flash:7m(dum)," \
"768k(BOOT-BIN)," \
"128k(BOOT-ENV),128k(BOOT-REDENV);" \
"e1000000.flash:-(ubi)"
@@ -509,8 +509,8 @@
"${netmask}:${hostname}:${netdev}:off " \
"console=${console},${baudrate} ${othbootargs}\0" \
"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"
\
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
\
"\0"
#define CONFIG_NFSBOOTCOMMAND \
diff --git a/include/configs/imx27lite-common.h
b/include/configs/imx27lite-common.h
index e2b6fca..08d3c76 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -179,8 +179,8 @@
" +${filesize};cp.b ${fileaddr} " \
__stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0" \
"upd=run load update\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"
\
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
\
/* additions for new relocation code, must be added to all boards */
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 0a8501bd..8b04ba4 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -50,7 +50,7 @@
***********************************************************/
-#define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:128k(uboot)ro," \
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=physmap-flash.0:128k(uboot)ro," \
"1536k(kernel),-(root)"
#define CONFIG_NETMASK 255.255.255.0
@@ -70,7 +70,7 @@
"bootcmd_flash=run bootargs_base bootargs_mtd bootargs_flash;" \
"bootm 0x80000000\0" \
"unlock=yes\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
\
"prg_uboot=tftpboot 0x80000000 $(uboot);" \
"protect off 0xa0000000 +0x20000;" \
"erase 0xa0000000 +0x20000;" \
diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index a1b7036..67299d5 100644
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -161,8 +161,8 @@
/* MTD device */
# define CONFIG_MTD_DEVICE
# define CONFIG_MTD_PARTITIONS
-# define MTDIDS_DEFAULT "nand0=gpmi-nand"
-# define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:2m(spl),2m(uboot),"
\
+# define CONFIG_MTDIDS_DEFAULT "nand0=gpmi-nand"
+# define CONFIG_MTDPARTS_DEFAULT
"mtdparts=gpmi-nand:2m(spl),2m(uboot)," \
"1m(env),8m(kernel),1m(dtb),-(rootfs)"
# define CONFIG_APBH_DMA
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index c1e9f5d..76794f6 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -154,8 +154,8 @@
/* MTD device */
# define CONFIG_MTD_DEVICE
# define CONFIG_MTD_PARTITIONS
-# define MTDIDS_DEFAULT "nand0=gpmi-nand"
-# define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:4m(uboot)," \
+# define CONFIG_MTDIDS_DEFAULT "nand0=gpmi-nand"
+# define CONFIG_MTDPARTS_DEFAULT "mtdparts=gpmi-nand:4m(uboot)," \
"1m(env),16m(kernel),1m(dtb),-(fs)"
/* DMA stuff, needed for GPMI/MXS NAND support */
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index d2fc81b..a44110f 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -224,8 +224,8 @@
"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
"mtddevname=uboot-env\0" \
"mtddevnum=0\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"u-boot=/tftpboot/ipam390/u-boot.ais\0" \
"upd_uboot=tftp c0000000 ${u-boot};nand erase.part u-boot;" \
"nand write c0000000 20000 ${filesize}\0" \
@@ -247,8 +247,8 @@
#define CONFIG_MTD_PARTITIONS
#define MTDIDS_NAME_STR "davinci_nand.0"
-#define MTDIDS_DEFAULT "nand0=" MTDIDS_NAME_STR
-#define MTDPARTS_DEFAULT "mtdparts=" MTDIDS_NAME_STR ":" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=" MTDIDS_NAME_STR
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=" MTDIDS_NAME_STR ":" \
"128k(u-boot-env)," \
"1408k(u-boot)," \
"128k(bootparms)," \
diff --git a/include/configs/km/keymile-common.h
b/include/configs/km/keymile-common.h
index 8e827d0..3f79390 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -216,8 +216,8 @@
"init=/sbin/init-overlay.sh\0" \
"load_addr_r="__stringify(CONFIG_KM_KERNEL_ADDR) "\0" \
"load=tftpboot ${load_addr_r} ${u-boot}\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"
\
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
\
""
#endif /* CONFIG_KM_DEF_ENV */
diff --git a/include/configs/km/km83xx-common.h
b/include/configs/km/km83xx-common.h
index 810b23e..aaf006b 100644
--- a/include/configs/km/km83xx-common.h
+++ b/include/configs/km/km83xx-common.h
@@ -12,18 +12,18 @@
#include "keymile-common.h"
#include "km-powerpc.h"
-#ifndef MTDIDS_DEFAULT
-# define MTDIDS_DEFAULT "nor0=boot"
-#endif /* MTDIDS_DEFAULT */
+#ifndef CONFIG_MTDIDS_DEFAULT
+# define CONFIG_MTDIDS_DEFAULT "nor0=boot"
+#endif /* CONFIG_MTDIDS_DEFAULT */
-#ifndef MTDPARTS_DEFAULT
-# define MTDPARTS_DEFAULT "mtdparts=" \
+#ifndef CONFIG_MTDPARTS_DEFAULT
+# define CONFIG_MTDPARTS_DEFAULT "mtdparts=" \
"boot:" \
"768k(u-boot)," \
"128k(env)," \
"128k(envred)," \
"-(" CONFIG_KM_UBI_PARTITION_NAME_BOOT ");"
-#endif /* MTDPARTS_DEFAULT */
+#endif /* CONFIG_MTDPARTS_DEFAULT */
#define CONFIG_MISC_INIT_R
/*
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 8866658..5f9a0a0 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -227,15 +227,15 @@ int get_scl(void);
#define FLASH_GPIO_PIN 0x00010000
#define KM_FLASH_GPIO_PIN 16
-#ifndef MTDIDS_DEFAULT
-# define MTDIDS_DEFAULT "nand0=orion_nand"
-#endif /* MTDIDS_DEFAULT */
+#ifndef CONFIG_MTDIDS_DEFAULT
+# define CONFIG_MTDIDS_DEFAULT "nand0=orion_nand"
+#endif /* CONFIG_MTDIDS_DEFAULT */
-#ifndef MTDPARTS_DEFAULT
-# define MTDPARTS_DEFAULT "mtdparts=" \
+#ifndef CONFIG_MTDPARTS_DEFAULT
+# define CONFIG_MTDPARTS_DEFAULT "mtdparts=" \
"orion_nand:" \
"-(" CONFIG_KM_UBI_PARTITION_NAME_BOOT ");"
-#endif /* MTDPARTS_DEFAULT */
+#endif /* CONFIG_MTDPARTS_DEFAULT */
#define CONFIG_KM_UPDATE_UBOOT
\
"update=" \
diff --git a/include/configs/km/kmp204x-common.h
b/include/configs/km/kmp204x-common.h
index ff3bce8..65d3e9f 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -391,15 +391,15 @@ int get_scl(void);
#define CONFIG_KM_DEF_ENV "km-common=empty\0"
#endif
-#ifndef MTDIDS_DEFAULT
-# define MTDIDS_DEFAULT "nand0=fsl_elbc_nand"
-#endif /* MTDIDS_DEFAULT */
+#ifndef CONFIG_MTDIDS_DEFAULT
+# define CONFIG_MTDIDS_DEFAULT "nand0=fsl_elbc_nand"
+#endif /* CONFIG_MTDIDS_DEFAULT */
-#ifndef MTDPARTS_DEFAULT
-# define MTDPARTS_DEFAULT "mtdparts=" \
+#ifndef CONFIG_MTDPARTS_DEFAULT
+# define CONFIG_MTDPARTS_DEFAULT "mtdparts=" \
"fsl_elbc_nand:" \
"-(" CONFIG_KM_UBI_PARTITION_NAME_BOOT ");"
-#endif /* MTDPARTS_DEFAULT */
+#endif /* CONFIG_MTDPARTS_DEFAULT */
/* architecture specific default bootargs */
#define CONFIG_KM_DEF_BOOT_ARGS_CPU ""
diff --git a/include/configs/km8360.h b/include/configs/km8360.h
index f482e2c..571ac8a 100644
--- a/include/configs/km8360.h
+++ b/include/configs/km8360.h
@@ -29,9 +29,9 @@
#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0"
#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1"
-#define MTDIDS_DEFAULT "nor0=boot,nand0=app"
+#define CONFIG_MTDIDS_DEFAULT "nor0=boot,nand0=app"
-#define MTDPARTS_DEFAULT "mtdparts=" \
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts="
\
"boot:" \
"768k(u-boot)," \
"128k(env)," \
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 00af52d..c84d828 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -240,10 +240,10 @@
#ifndef SPL_NO_MISC
#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define MTDPARTS_DEFAULT "mtdparts=spi0.0:1m(uboot)," \
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=spi0.0:1m(uboot)," \
"5m(kernel),1m(dtb),9m(file_system)"
#else
-#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:" \
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=60000000.nor:" \
"2m@0x100000(nor_bank0_uboot),"\
"40m@0x1100000(nor_bank0_fit)," \
"7m(nor_bank0_user)," \
@@ -280,7 +280,7 @@
"load_addr=0xa0000000\0" \
"kernel_size=0x2800000\0" \
"console=ttyS0,115200\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
BOOTENV \
"boot_scripts=ls1043ardb_boot.scr\0" \
"boot_script_hdr=hdr_ls1043ardb_bs.out\0" \
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index b922139..5a31d32 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -228,7 +228,7 @@
"kernel_load=0xa0000000\0" \
"kernel_size=0x2800000\0" \
"console=ttyS0,115200\0" \
- MTDPARTS_DEFAULT "\0" \
+ CONFIG_MTDPARTS_DEFAULT "\0" \
BOOTENV \
"boot_scripts=ls1046ardb_boot.scr\0" \
"boot_script_hdr=hdr_ls1046ardb_bs.out\0" \
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 325ac2c..84ff81a 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -465,10 +465,10 @@ unsigned long get_board_ddr_clk(void);
#endif
#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:2m(uboot)," \
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:2m(uboot)," \
"14m(free)"
#else
-#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:" \
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=60000000.nor:" \
"2m@0x100000(nor_bank0_uboot),"\
"40m@0x1100000(nor_bank0_fit)," \
"7m(nor_bank0_user)," \
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 7bbd4ad..5965e61 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -236,7 +236,7 @@
#undef CONFIG_BOOTCOMMAND
#define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \
"&& esbc_halt; run qspi_bootcmd;"
-#define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:1m(rcw)," \
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:1m(rcw)," \
"15m(u-boot),48m(kernel.itb);" \
"7e800000.flash:16m(nand_uboot)," \
"48m(nand_kernel),448m(nand_free)"
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 4fcf480..ebb2eca 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -33,8 +33,8 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nand0=gpmi-nand"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=gpmi-nand:" \
"3m(u-boot)," \
"512k(env1)," \
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 4dc6e16..6a8a916 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -95,8 +95,8 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nand0=mxc_nand"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nand0=mxc_nand"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=mxc_nand:" \
"1024k(u-boot)," \
"512k(env1)," \
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 755c949..aec23f3 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -83,8 +83,8 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nor0=8000000.nor"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nor0=8000000.nor"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=8000000.nor:" \
"32m@0x0(mccmon6-image.nor)," \
"256k@0x40000(u-boot-env.nor)," \
@@ -141,7 +141,7 @@
"setenv kernelnor 0x08180000;" \
"setenv dtbnor 0x09980000;" \
"setenv bootargs console=${console} " \
- ""MTDPARTS_DEFAULT" " \
+ ""CONFIG_MTDPARTS_DEFAULT" " \
"root=/dev/mmcblk1 rootfstype=ext4 rw rootwait noinitrd;" \
"cp.l ${dtbnor} ${dtbloadaddr} 0x8000;" \
"bootm ${kernelnor} - ${dtbloadaddr};\0" \
@@ -154,7 +154,7 @@
"setenv swurootfsnor 0x09180000;" \
"setenv swudtbnor 0x099A0000;" \
"setenv bootargs console=${console} " \
- ""MTDPARTS_DEFAULT" " \
+ ""CONFIG_MTDPARTS_DEFAULT" " \
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
":${hostname}::off root=/dev/ram rw;" \
"cp.l ${swurootfsnor} ${rootfsloadaddr} 0x200000;" \
@@ -186,7 +186,7 @@
"fi;" \
"fi;" \
"fi\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"fdt_addr=0x18000000\0" \
"bootdev=1\0" \
"bootpart=1\0" \
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 7047e3f..9624eaf 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -114,8 +114,8 @@
#define CONFIG_BOOTFILE "uImage"
/* Setup MTD for NAND on the SOM */
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(MLO)," \
+#define CONFIG_MTDIDS_DEFAULT "nand0=omap2-nand.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(MLO),"
\
"1m(u-boot),256k(env1)," \
"256k(env2),6m(kernel),6m(k_recovery)," \
"8m(fs_recovery),-(common_data)"
diff --git a/include/configs/microblaze-generic.h
b/include/configs/microblaze-generic.h
index e190493..7dd6aba 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -172,10 +172,10 @@
/* MTD partitions */
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=flash-0"
+#define CONFIG_MTDIDS_DEFAULT "nor0=flash-0"
/* default mtd partition table */
-#define MTDPARTS_DEFAULT "mtdparts=flash-0:256k(u-boot),"\
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=flash-0:256k(u-boot),"\
"256k(env),3m(kernel),1m(romfs),"\
"1m(cramfs),-(jffs2)"
#endif
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index ed83eeb..ff5ce59 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -29,10 +29,10 @@
/*
* Set its own mtdparts, different from common
*/
-#undef MTDIDS_DEFAULT
-#undef MTDPARTS_DEFAULT
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(MLO)," \
+#undef CONFIG_MTDIDS_DEFAULT
+#undef CONFIG_MTDPARTS_DEFAULT
+#define CONFIG_MTDIDS_DEFAULT "nand0=omap2-nand.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(MLO)," \
"1m(u-boot),256k(env1)," \
"256k(env2),8m(ubisystem),-(rootfs)"
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 2d43f68..56a4898 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -61,8 +61,8 @@
#ifdef CONFIG_CMD_NAND
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nand0=gpmi-nand"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=gpmi-nand:" \
"3m(bootloader)ro," \
"512k(environment)," \
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 526f794..33843bc 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -142,8 +142,8 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_FLASH_CFI_MTD
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nand0=mxc_nand,nor0=physmap-flash.0"
-#define MTDPARTS_DEFAULT "mtdparts=mxc_nand:1m(boot),5m(linux)," \
+#define CONFIG_MTDIDS_DEFAULT "nand0=mxc_nand,nor0=physmap-flash.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=mxc_nand:1m(boot),5m(linux),"
\
"96m(root),8m(cfg),1938m(user);" \
"physmap-flash.0:512k(b),4m(k),30m(u),28m(r)"
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index a072708..96537ef 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -166,8 +166,8 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "onenand0=onenand"
-#define MTDPARTS_DEFAULT "mtdparts=onenand:" \
+#define CONFIG_MTDIDS_DEFAULT "onenand0=onenand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=onenand:" \
__stringify(PART1_SIZE) PART1_SUFF "(" PART1_NAME ")ro," \
__stringify(PART2_SIZE) PART2_SUFF "(" PART2_NAME ")," \
__stringify(PART3_SIZE) PART3_SUFF "(" PART3_NAME ")," \
@@ -200,13 +200,13 @@ int rx51_kp_tstc(struct stdio_dev *sdev);
int rx51_kp_getc(struct stdio_dev *sdev);
#endif
-#ifndef MTDPARTS_DEFAULT
-#define MTDPARTS_DEFAULT
+#ifndef CONFIG_MTDPARTS_DEFAULT
+#define CONFIG_MTDPARTS_DEFAULT
#endif
/* Environment information */
#define CONFIG_EXTRA_ENV_SETTINGS \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"usbtty=cdc_acm\0" \
"stdin=vga\0" \
"stdout=vga\0" \
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 26e2c8d..9c0ef85 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -60,8 +60,8 @@
/* commands to include */
-#define MTDIDS_DEFAULT "nand0=nand"
-#define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
"1920k(u-boot),128k(u-boot-env),"\
"4m(kernel),-(fs)"
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index a4a40f4..9536784 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -92,13 +92,6 @@
#define CONFIG_SYS_NAND_MAX_ECCPOS 56
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:"\
- "512k(MLO),"\
- "1792k(u-boot),"\
- "128k(spl-os)," \
- "128k(u-boot-env),"\
- "6m(kernel),-(fs)"
#endif
/* Environment information */
@@ -110,8 +103,8 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 rw\0" \
"mmcrootfstype=ext4 rootwait\0" \
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index d53657f..66f236a 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -51,15 +51,15 @@
* linux 64 * NAND_BLOCK_SIZE = 8 MiB
* rootfs remainder
*/
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=omap2-nand.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:" \
"512k(xloader)," \
"1792k(u-boot)," \
"256k(environ)," \
"8m(linux)," \
"-(rootfs)"
#else /* CONFIG_NAND */
-#define MTDPARTS_DEFAULT
+#define CONFIG_MTDPARTS_DEFAULT
#endif /* CONFIG_NAND */
/* Board NAND Info. */
@@ -82,7 +82,7 @@
"mmcrootfstype=ext4 rootwait\0" \
"nandroot=ubi0:rootfs ubi.mtd=4\0" \
"nandrootfstype=ubifs\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"mmcargs=setenv bootargs console=${console} " \
"${optargs} " \
"mpurate=${mpurate} " \
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 7f1b571..62ff613 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -56,12 +56,12 @@
#ifdef CONFIG_NAND
#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(xloader),"\
+#define CONFIG_MTDIDS_DEFAULT "nand0=omap2-nand.0"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=omap2-nand.0:512k(xloader),"\
"1920k(uboot),128k(uboot-env),"\
"10m(boot),-(rootfs)"
#else
-#define MTDPARTS_DEFAULT
+#define CONFIG_MTDPARTS_DEFAULT
#endif
@@ -84,7 +84,7 @@
"usbtty=cdc_acm\0" \
"bootargs_ubi=ubi.mtd=4 ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs " \
"rw rootflags=bulk_read vram=6272K omapfb.vram=0:3000K\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
BOOTENV \
/* memtest works on */
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index c6db88a..e0441d3 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -48,8 +48,8 @@
#define CONFIG_USBD_MANUFACTURER "Texas Instruments"
#define CONFIG_USBD_PRODUCT_NAME "Zoom1"
-#define MTDIDS_DEFAULT "nand0=nand"
-#define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
"1920k(u-boot),128k(u-boot-env),"\
"4m(kernel),-(fs)"
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index d685411..40e4f1f 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -59,18 +59,18 @@
"setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \
"${x_bootcmd_usb}; bootm 0x6400000;"
-#define MTDIDS_DEFAULT "nand0=nand_mtd"
-#define MTDPARTS_DEFAULT "mtdparts=nand_mtd:0x100000@0x000000(uboot),"\
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand_mtd"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=nand_mtd:0x100000@0x000000(uboot),"\
"0x400000@0x100000(uImage),"\
"0x1fb00000@0x500000(rootfs)"
#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \
- "=ttyS0,115200 "MTDPARTS_DEFAULT " rw ubi.mtd=2,2048\0" \
+ "=ttyS0,115200 "CONFIG_MTDPARTS_DEFAULT " rw ubi.mtd=2,2048\0"
\
"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \
"x_bootcmd_usb=usb start\0" \
"x_bootargs_root=root=ubi0:rootfs rootfstype=ubifs\0" \
- "mtdids="MTDIDS_DEFAULT"\0" \
- "mtdparts="MTDPARTS_DEFAULT"\0"
+ "mtdids="CONFIG_MTDIDS_DEFAULT"\0"
\
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0"
/*
* Ethernet Driver configuration
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 81e7fa4..1559d98 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -73,8 +73,8 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=ec000000.nor"
-#define MTDPARTS_DEFAULT "mtdparts=ec000000.nor:128k(dtb),6016k(kernel)," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=ec000000.nor"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=ec000000.nor:128k(dtb),6016k(kernel)," \
"57088k(fs),1m(vsc7385-firmware),1280k(u-boot)"
#endif
@@ -99,13 +99,13 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
#ifdef CONFIG_PHYS_64BIT
-#define MTDIDS_DEFAULT "nor0=fef000000.nor"
-#define MTDPARTS_DEFAULT "mtdparts=fef000000.nor:256k(vsc7385-firmware)," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=fef000000.nor"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=fef000000.nor:256k(vsc7385-firmware)," \
"256k(dtb),4608k(kernel),9728k(fs)," \
"256k(qe-ucode-firmware),1280k(u-boot)"
#else
-#define MTDIDS_DEFAULT "nor0=ef000000.nor"
-#define MTDPARTS_DEFAULT "mtdparts=ef000000.nor:256k(vsc7385-firmware)," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=ef000000.nor"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=ef000000.nor:256k(vsc7385-firmware)," \
"256k(dtb),4608k(kernel),9728k(fs)," \
"256k(qe-ucode-firmware),1280k(u-boot)"
#endif
@@ -157,12 +157,12 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
#ifdef CONFIG_PHYS_64BIT
-#define MTDIDS_DEFAULT "nor0=fef000000.nor"
-#define MTDPARTS_DEFAULT "mtdparts=fef000000.nor:256k(vsc7385-firmware)," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=fef000000.nor"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=fef000000.nor:256k(vsc7385-firmware)," \
"256k(dtb),4608k(kernel),9984k(fs),1280k(u-boot)"
#else
-#define MTDIDS_DEFAULT "nor0=ef000000.nor"
-#define MTDPARTS_DEFAULT "mtdparts=ef000000.nor:256k(vsc7385-firmware)," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=ef000000.nor"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=ef000000.nor:256k(vsc7385-firmware)," \
"256k(dtb),4608k(kernel),9984k(fs),1280k(u-boot)"
#endif
#endif
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 459086e..557f79e 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -347,8 +347,8 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=ec000000.nor"
-#define MTDPARTS_DEFAULT "mtdparts=ec000000.nor:256k(vsc7385-firmware)," \
+#define CONFIG_MTDIDS_DEFAULT "nor0=ec000000.nor"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=ec000000.nor:256k(vsc7385-firmware)," \
"256k(dtb),5632k(kernel),57856k(fs)," \
"256k(qe-ucode-firmware),1280k(u-boot)"
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index b4b60ac..a04da5b 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -35,12 +35,12 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#ifndef MTDIDS_DEFAULT
-#define MTDIDS_DEFAULT "nand0=NAND"
+#ifndef CONFIG_MTDIDS_DEFAULT
+#define CONFIG_MTDIDS_DEFAULT "nand0=NAND"
#endif
-#ifndef MTDPARTS_DEFAULT
-#define MTDPARTS_DEFAULT "mtdparts=NAND:640k(bootloader)"\
+#ifndef CONFIG_MTDPARTS_DEFAULT
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=NAND:640k(bootloader)"\
",128k(env1)"\
",128k(env2)"\
",128k(dtb)"\
@@ -133,7 +133,7 @@
"nfs_root=/path/to/nfs/root\0" \
"tftptimeout=1000\0" \
"tftptimeoutcountmax=1000000\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"bootargs_base=setenv bootargs rw " \
" mem=" __stringify(CONFIG_PCM052_DDR_SIZE) "M " \
"console=ttyLP1,115200n8\0" \
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 2c1221d..c09f6fd 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -73,8 +73,8 @@
/* Filesystem support */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT "nand0=nand"
-#define MTDPARTS_DEFAULT "mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index 242a139..786b67a 100644
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -82,8 +82,8 @@
"tftp ${fdtaddr} ${fdtfile}; " \
"run netargs; " \
"bootz ${loadaddr} - ${fdtaddr}\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"nandargs=setenv bootargs console=${console} " \
"${optargs} " \
"root=${nandroot} " \
@@ -150,9 +150,9 @@
/* #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 */
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
+#define CONFIG_MTDIDS_DEFAULT "nand0=omap2-nand.0"
/* Size must be a multiple of Nand erase size (524288 b) */
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(SPL)," \
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=omap2-nand.0:512k(SPL)," \
"512k(SPL.backup1)," \
"512k(SPL.backup2)," \
"512k(SPL.backup3),1536k(u-boot)," \
diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index be90ce9..64aed98 100644
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -72,8 +72,8 @@
/* Filesystem support */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:-(nand);" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=gpmi-nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=gpmi-nand:-(nand);" \
"spi2.0:1024k(bootloader),64k(env1),64k(env2),-(rescue)"
/* Various command support */
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 4801cb2..175a727 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -121,12 +121,12 @@
#define CONFIG_MTD_PARTITIONS
#if (CONFIG_SYS_NAND_MAX_CHIPS == 1)
-#define MTDIDS_DEFAULT "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:14M(spl),2M(uboot)," \
+#define CONFIG_MTDIDS_DEFAULT "nand0=gpmi-nand"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=gpmi-nand:14M(spl),2M(uboot)," \
"512k(env1),512k(env2),-(ubi)"
#elif (CONFIG_SYS_NAND_MAX_CHIPS == 2)
-#define MTDIDS_DEFAULT "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:14M(spl),2M(uboot)," \
+#define CONFIG_MTDIDS_DEFAULT "nand0=gpmi-nand"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=gpmi-nand:14M(spl),2M(uboot)," \
"512k(env1),512k(env2),495M(ubi0)," \
"14M(res0),2M(res1)," \
"512k(res2),512k(res3),-(ubi1)"
@@ -159,8 +159,8 @@
"baudrate=115200\0" \
"boot_scr=boot.uboot\0" \
"boot_vol=0\0" \
- "mtdids="MTDIDS_DEFAULT"\0" \
- "mtdparts="MTDPARTS_DEFAULT"\0" \
+ "mtdids="CONFIG_MTDIDS_DEFAULT"\0"
\
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0"
\
"mmcfs=ext2\0" \
"mmcrootpart=1\0" \
\
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 38668de..75ae849 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -246,8 +246,8 @@
#define CONFIG_BOOTCOMMAND "run flashboot"
-#define MTDIDS_DEFAULT "nor0=physmap-flash.0,nand0=nand"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nor0=physmap-flash.0,nand0=nand"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=physmap-flash.0:" \
"256k(u-boot)ro," \
"64k(u-boot-env)ro," \
@@ -258,8 +258,8 @@
#define CONFIG_CON_ROT "fbcon=rotate:3 "
#define CONFIG_EXTRA_ENV_SETTINGS \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"partition=nand0,0\0" \
"ramargs=setenv bootargs $(bootargs) $(mtdparts)\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 667d68f..6f1288b 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -278,8 +278,8 @@
#define CONFIG_CON_ROT "fbcon=rotate:3 "
-#define MTDIDS_DEFAULT "nor0=physmap-flash.0,nand0=nand"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT
"nor0=physmap-flash.0,nand0=nand"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=physmap-flash.0:" \
"256k(u-boot)ro," \
"64k(u-boot-env)ro," \
@@ -288,8 +288,8 @@
"nand:-(nand)"
#define CONFIG_EXTRA_ENV_SETTINGS \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"partition=nand0,0\0" \
"ramargs=setenv bootargs $(bootargs) $(mtdparts)\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index e8e0c7e..7348954 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -45,7 +45,7 @@
#ifndef CONFIG_SPL_BUILD
/* Use common default */
-#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V1
+#define CONFIG_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT_V1
/* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 721f94c..faae9ad 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -53,7 +53,7 @@
#define CONFIG_ENV_SIZE_REDUND 0x2000
#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
-#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V3
+#define CONFIG_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT_V3
#ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/rut.h b/include/configs/rut.h
index 9f9bc71..fcc0ced 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -43,7 +43,7 @@
#ifndef CONFIG_SPL_BUILD
/* Use common default */
-#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V1
+#define CONFIG_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT_V1
/* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 11d2443..ea9deab 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -66,8 +66,8 @@
#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
/* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
-#define MTDIDS_DEFAULT "onenand0=samsung-onenand"
-#define MTDPARTS_DEFAULT "mtdparts=samsung-onenand:1m(bootloader)"\
+#define CONFIG_MTDIDS_DEFAULT "onenand0=samsung-onenand"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=samsung-onenand:1m(bootloader)"\
",256k(params)"\
",2816k(config)"\
",8m(csa)"\
diff --git a/include/configs/s5pc210_universal.h
b/include/configs/s5pc210_universal.h
index 9859f30..5619db5 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -50,9 +50,9 @@
#define CONFIG_MTD_PARTITIONS
/* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
-#define MTDIDS_DEFAULT "onenand0=samsung-onenand"
+#define CONFIG_MTDIDS_DEFAULT "onenand0=samsung-onenand"
-#define MTDPARTS_DEFAULT "mtdparts=samsung-onenand:"\
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=samsung-onenand:"\
"128k(s-boot)"\
",896k(bootloader)"\
",256k(params)"\
@@ -64,7 +64,7 @@
",60m(qboot)"\
",-(UBI)\0"
-#define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT
+#define NORMAL_CONFIG_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT
#define MBRPARTS_DEFAULT "20M(permanent)"\
",20M(boot)"\
@@ -133,7 +133,7 @@
"verify=n\0" \
"rootfstype=ext4\0" \
"console=" CONFIG_DEFAULT_CONSOLE \
- "mtdparts=" MTDPARTS_DEFAULT \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT \
"mbrparts=" MBRPARTS_DEFAULT \
"meminfo=crashkernel=32M@0x50000000\0" \
"nfsroot=/nfsroot/arm\0" \
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index d4c9995..3b20a85 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -63,9 +63,9 @@
"x_bootcmd_usb=usb start\0" \
"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
-#define MTDIDS_DEFAULT "nand0=orion_nand"
+#define CONFIG_MTDIDS_DEFAULT "nand0=orion_nand"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts="CONFIG_MTDPARTS
/*
diff --git a/include/configs/siemens-am33x-common.h
b/include/configs/siemens-am33x-common.h
index 4ea3a0b..9f8ff67 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -318,8 +318,8 @@
*-------------------------------------------------------
*/
#define MTDIDS_NAME_STR "omap2-nand.0"
-#define MTDIDS_DEFAULT "nand0=" MTDIDS_NAME_STR
-#define MTDPARTS_DEFAULT_V1 "mtdparts=" MTDIDS_NAME_STR ":" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=" MTDIDS_NAME_STR
+#define CONFIG_MTDPARTS_DEFAULT_V1 "mtdparts=" MTDIDS_NAME_STR ":" \
"128k(spl)," \
"128k(spl.backup1)," \
"128k(spl.backup2)," \
@@ -409,7 +409,7 @@
*-------------------------------------------------------
*/
-#define MTDPARTS_DEFAULT_V2 "mtdparts=" MTDIDS_NAME_STR ":" \
+#define CONFIG_MTDPARTS_DEFAULT_V2 "mtdparts=" MTDIDS_NAME_STR ":" \
"128k(spl)," \
"128k(spl.backup1)," \
"128k(spl.backup2)," \
@@ -499,7 +499,7 @@
*-------------------------------------------------------
*/
-#define MTDPARTS_DEFAULT_V3 "mtdparts=" MTDIDS_NAME_STR ":" \
+#define CONFIG_MTDPARTS_DEFAULT_V3 "mtdparts=" MTDIDS_NAME_STR ":" \
"128k(spl)," \
"128k(spl.backup1)," \
"128k(spl.backup2)," \
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index fe24b3a..7884ca1 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -93,8 +93,8 @@
#define CONFIG_MTD_DEVICE
#define MTDIDS_NAME_STR "atmel_nand"
-#define MTDIDS_DEFAULT "nand0=" MTDIDS_NAME_STR
-#define MTDPARTS_DEFAULT "mtdparts=" MTDIDS_NAME_STR ":" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=" MTDIDS_NAME_STR
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=" MTDIDS_NAME_STR ":" \
"128k(Bootstrap)," \
"896k(U-Boot)," \
"512k(ENV0)," \
@@ -193,7 +193,7 @@
\
"basicargs=console=ttyS0,115200\0" \
\
- "mtdparts="MTDPARTS_DEFAULT"\0"
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0"
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_INIT_SP_ADDR 0x301000
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 0a9c638..c943afd 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -59,14 +59,14 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "onenand0=s3c-onenand"
-#define MTDPARTS_DEFAULT "mtdparts=s3c-onenand:256k(bootloader)"\
+#define CONFIG_MTDIDS_DEFAULT "onenand0=s3c-onenand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=s3c-onenand:256k(bootloader)"\
",128k@0x40000(params)"\
",3m@0x60000(kernel)"\
",16m@0x360000(test)"\
",-(UBI)"
-#define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT
+#define NORMAL_CONFIG_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT
#define CONFIG_BOOTCOMMAND "run ubifsboot"
@@ -76,7 +76,7 @@
#define CONFIG_COMMON_BOOT "console=ttySAC0,115200n8" \
" mem=128M " \
- " " MTDPARTS_DEFAULT
+ " " CONFIG_MTDPARTS_DEFAULT
#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \
" onenand write 0x32008000 0x0 0x40000\0"
@@ -117,7 +117,7 @@
"set bootargs " CONFIG_RAMDISK_BOOT \
" initrd=0x33000000,8M ramdisk=8192\0" \
"rootfstype=cramfs\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"meminfo=mem=128M\0" \
"nfsroot=/nfsroot/arm\0" \
"bootblock=5\0" \
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 73a9744..a9b4c59 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -184,7 +184,7 @@ unsigned int cm_get_l4_sp_clk_hz(void);
#define CONFIG_SPI_FLASH_MTD
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nor0=ff705000.spi.0"
+#define CONFIG_MTDIDS_DEFAULT "nor0=ff705000.spi.0"
#endif
/* QSPI reference clock */
#ifndef __ASSEMBLY__
@@ -264,8 +264,8 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
* 5: rootfs 0x01000000 0x01000000 0
*
*/
-#if defined(CONFIG_CMD_SF) && !defined(MTDPARTS_DEFAULT)
-#define MTDPARTS_DEFAULT "mtdparts=ff705000.spi.0:"\
+#if defined(CONFIG_CMD_SF) && !defined(CONFIG_MTDPARTS_DEFAULT)
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=ff705000.spi.0:"\
"1m(u-boot)," \
"256k(env1)," \
"256k(env2)," \
diff --git a/include/configs/socfpga_vining_fpga.h
b/include/configs/socfpga_vining_fpga.h
index 4977881..12ef75a 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -167,7 +167,7 @@
"else echo \"Unsupported boot mode: \"${bootmode} ; " \
"fi\0" \
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=ff705000.spi.0:" \
"1m(u-boot)," \
"64k(env1)," \
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index 5f711d0..f9c608d 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -61,8 +61,8 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_JFFS2_CMDLINE
#define CONFIG_JFFS2_DEV "nor0"
-#define MTDIDS_DEFAULT "nor0=spi-flash.0"
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDIDS_DEFAULT "nor0=spi-flash.0"
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=spi-flash.0:" \
"1m(u-boot)," \
"7m(kernel)," \
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 7a22ef6..c18f5b0 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -471,17 +471,17 @@ extern int soft_i2c_gpio_scl;
#endif
#ifdef CONFIG_MTDIDS_DEFAULT
-#define SUNXI_MTDIDS_DEFAULT \
+#define SUNXI_CONFIG_MTDIDS_DEFAULT \
"mtdids=" CONFIG_MTDIDS_DEFAULT "\0"
#else
-#define SUNXI_MTDIDS_DEFAULT
+#define SUNXI_CONFIG_MTDIDS_DEFAULT
#endif
#ifdef CONFIG_MTDPARTS_DEFAULT
-#define SUNXI_MTDPARTS_DEFAULT \
+#define SUNXI_CONFIG_MTDPARTS_DEFAULT \
"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
#else
-#define SUNXI_MTDPARTS_DEFAULT
+#define SUNXI_CONFIG_MTDPARTS_DEFAULT
#endif
#define CONSOLE_ENV_SETTINGS \
@@ -500,8 +500,8 @@ extern int soft_i2c_gpio_scl;
DFU_ALT_INFO_RAM \
"fdtfile=" FDTFILE "\0" \
"console=ttyS0,115200\0" \
- SUNXI_MTDIDS_DEFAULT \
- SUNXI_MTDPARTS_DEFAULT \
+ SUNXI_CONFIG_MTDIDS_DEFAULT \
+ SUNXI_CONFIG_MTDPARTS_DEFAULT \
BOOTCMD_SUNXI_COMPAT \
BOOTENV
diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h
index 00deed6..c245766 100644
--- a/include/configs/suvd3.h
+++ b/include/configs/suvd3.h
@@ -43,8 +43,8 @@
#define CONFIG_KM_BOARD_NAME "kmtegr1"
#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0"
#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1"
-#define MTDIDS_DEFAULT "nor0=boot,nand0=app"
-#define MTDPARTS_DEFAULT "mtdparts=" \
+#define CONFIG_MTDIDS_DEFAULT "nor0=boot,nand0=app"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts="
\
"boot:" \
"768k(u-boot)," \
"256k(qe-fw)," \
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 4336251..f124a7a 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -218,8 +218,8 @@
#define CONFIG_MTD_DEVICE
/* Setup MTD for NAND on the SOM */
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(MLO)," \
+#define CONFIG_MTDIDS_DEFAULT "nand0=omap2-nand.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(MLO)," \
"1m(u-boot),256k(env1)," \
"256k(env2),6m(kernel),-(rootfs)"
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 9f6e243..da41406 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -63,8 +63,8 @@
/* commands to include */
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT "nand0=nand"
-#define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
"1920k(u-boot),128k(u-boot-env),"\
"4m(kernel),-(fs)"
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 23f4dbf..22c2db7 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -46,7 +46,7 @@
#define CONFIG_ENV_SIZE_REDUND 0x2000
#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
-#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V2
+#define CONFIG_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT_V2
#ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 1898a82..0192a9e 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -18,8 +18,8 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
#define CONFIG_BOOTCOMMAND \
"mmc rescan;" \
@@ -92,8 +92,8 @@
#define CONFIG_SYS_NAND_ECCBYTES 14
#define CONFIG_SYS_NAND_ONFI_DETECTION
#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW
-#define MTDIDS_DEFAULT "nand0=nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=nand.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand.0:" \
"128k(NAND.SPL)," \
"128k(NAND.SPL.backup1)," \
"128k(NAND.SPL.backup2)," \
diff --git a/include/configs/ti_armv7_keystone2.h
b/include/configs/ti_armv7_keystone2.h
index 2b2b85d..4f3d7dc 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -184,8 +184,8 @@
#define CONFIG_SYS_NAND_MAX_CHIPS 1
#define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nand0=davinci_nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=davinci_nand.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=davinci_nand.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=davinci_nand.0:" \
"1024k(bootloader)ro,512k(params)ro," \
"-(ubifs)"
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 3fb63f3..13e6a81 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -58,8 +58,8 @@
#define CONFIG_UBI_PART ubi
#define CONFIG_UBIFS_VOLUME rootfs0
-#define MTDIDS_DEFAULT "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:16M(uboot),512k(env1)," \
+#define CONFIG_MTDIDS_DEFAULT "nand0=gpmi-nand"
+#define CONFIG_MTDPARTS_DEFAULT
"mtdparts=gpmi-nand:16M(uboot),512k(env1)," \
"512k(env2),-(ubi)"
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -107,8 +107,8 @@
"upd_ubifs=run load_ubifs update_ubifs\0" \
"init_ubi=nand erase.part ubi;ubi part ${part};" \
"ubi create ${vol} c800000\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"
\
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
\
"nand_ubifs=run ubifs_mount ubifs_load ubifsargs addip" \
" addcon addmtd;" \
"bootm ${kernel_addr} - ${dtb_addr}\0" \
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 3820096..8d3a1e1 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -73,8 +73,8 @@
/* Board NAND Info */
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=omap2-nand.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:" \
"128k(SPL)," \
"1m(u-boot)," \
"384k(u-boot-env1)," \
@@ -122,8 +122,8 @@
"vram=3M\0" \
"defaultdisplay=lcd\0" \
"kernelopts=mtdoops.mtddev=3\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
"commonargs=" \
"setenv bootargs console=${console} " \
"${mtdparts} " \
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 753d821..362c69a 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -65,7 +65,7 @@
#define CONFIG_SYS_NAND_READY_PIN GPIO_PIN_PA(22)
#endif
-#define MTDPARTS_DEFAULT \
+#define CONFIG_MTDPARTS_DEFAULT \
"mtdparts=atmel_nand:16m(kernel)ro,120m(root1),-(root2)"
/* Ethernet */
@@ -96,7 +96,7 @@
#define CONFIG_ENV_SPI_MAX_HZ 15000000
#define CONFIG_BOOTCOMMAND "nboot 21000000 0"
#define CONFIG_EXTRA_ENV_SETTINGS \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
diff --git a/include/configs/vct.h b/include/configs/vct.h
index e7c3d4b..253428f 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -226,8 +226,8 @@ int vct_gpio_get(int pin);
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "onenand0=onenand"
-#define MTDPARTS_DEFAULT "mtdparts=onenand:128k(u-boot)," \
+#define CONFIG_MTDIDS_DEFAULT "onenand0=onenand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=onenand:128k(u-boot),"
\
"128k(env)," \
"20m(kernel)," \
"-(rootfs)"
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 6aaa4d1..f4a94db 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -40,8 +40,8 @@
/* Dynamic MTD partition support */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT "nand0=fsl_nfc"
-#define MTDPARTS_DEFAULT "mtdparts=fsl_nfc:" \
+#define CONFIG_MTDIDS_DEFAULT "nand0=fsl_nfc"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=fsl_nfc:"
\
"128k(vf-bcb)ro," \
"1408k(u-boot)ro," \
"512k(u-boot-env)," \
diff --git a/include/configs/woodburn_common.h
b/include/configs/woodburn_common.h
index f3eba9c..a188c19 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -134,8 +134,8 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_FLASH_CFI_MTD
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nand0=mxc_nand,nor0=physmap-flash.0"
-#define MTDPARTS_DEFAULT "mtdparts=mxc_nand:50m(root1)," \
+#define CONFIG_MTDIDS_DEFAULT "nand0=mxc_nand,nor0=physmap-flash.0"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=mxc_nand:50m(root1)," \
"32m(rootfb)," \
"64m(pcache)," \
"64m(app1)," \
diff --git a/include/configs/x600.h b/include/configs/x600.h
index 93c3637..fa2205f 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -141,8 +141,8 @@
#define CONFIG_UBI_PART ubi0
#define CONFIG_UBIFS_VOLUME rootfs
-#define MTDIDS_DEFAULT "nand0=nand"
-#define MTDPARTS_DEFAULT "mtdparts=nand:64M(ubi0),64M(ubi1)"
+#define CONFIG_MTDIDS_DEFAULT "nand0=nand"
+#define CONFIG_MTDPARTS_DEFAULT "mtdparts=nand:64M(ubi0),64M(ubi1)"
#define CONFIG_EXTRA_ENV_SETTINGS
\
"u-boot_addr=1000000\0" \
@@ -199,8 +199,8 @@
"net_nfs=run load_dtb load_kernel; " \
"run nfsargs addip addcon addmtd addmisc;" \
"bootm ${kernel_addr} - ${dtb_addr}\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"
\
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
\
"nand_ubifs=run ubifs_mount ubifs_load ubifsargs addip" \
" addcon addmisc addmtd;" \
"bootm ${kernel_addr} - ${dtb_addr}\0" \
--
2.7.4
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
