Complete migration of MTDPARTS_DEFAULT / MTDIDS_DEFAULT, include in environment

- Ensure that everyone setting mtdids= and mtdparts= is doing so via the
  CONFIG options.
- If the CONFIG options are set, ensure that the default environment
  sets mtdparts / mtdids.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/aristainetos2c_defconfig b/configs/aristainetos2c_defconfig
index 7a3e690..26bcb00 100644 (file)
--- a/configs/aristainetos2c_defconfig
+++ b/configs/aristainetos2c_defconfig
@@ -51,6 +51,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:832k(u-boot),64k(env),64k(env-red),-(ubi-nor)"
 CONFIG_CMD_UBI=y
 CONFIG_OF_CONTROL=y
 CONFIG_DTB_RESELECT=y

diff --git a/configs/aristainetos2ccslb_defconfig b/configs/aristainetos2ccslb_defconfig
index 6bc78b7..6829030 100644 (file)
--- a/configs/aristainetos2ccslb_defconfig
+++ b/configs/aristainetos2ccslb_defconfig
@@ -51,6 +51,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:832k(u-boot),64k(env),64k(env-red),-(ubi-nor)"
 CONFIG_CMD_UBI=y
 CONFIG_OF_CONTROL=y
 CONFIG_DTB_RESELECT=y

diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index 3cb09ea..6f99cdd 100644 (file)
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -36,6 +36,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),-(root)"
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y

diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index 4771e72..6ed3d68 100644 (file)
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -37,6 +37,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),-@0x100000(root)"
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y

diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index 644d0ab..7adf76d 100644 (file)
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -37,6 +37,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x80000@0x0(uboot),0x20000@0x80000(uboot_env),-@0xa0000(rootfs)"
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y

diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 99f36b7..cc971f9 100644 (file)
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -38,6 +38,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xa0000@0x0(uboot),0x010000@0xa0000(env),0x500000@0xc0000(uimage),0x1a40000@0x5c0000(rootfs)"
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y

diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
index 0c1d808..2b39ae7 100644 (file)
--- a/configs/nsa310s_defconfig
+++ b/configs/nsa310s_defconfig
@@ -39,6 +39,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(root)"
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y

diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index b7f9c12..e1a2517 100644 (file)
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -35,6 +35,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1M(u-boot),4M(uImage),32M(rootfs),-(data)"
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 13d1108..754bcc3 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -27,8 +27,6 @@
 
 #ifdef CONFIG_MTD_RAW_NAND
 #define NANDARGS \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "root=${nandroot} " \

diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h
index 8d36dde..3952783 100644 (file)
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -54,8 +54,6 @@
                                "bootz ${loadaddr} - ${fdtaddr};" \
                        "fi;" \
                "fi;\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; " \

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index b896f96..e6c9039 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -49,8 +49,6 @@
        "bootenv=uEnv.txt\0" \
        "cmdline=\0" \
        "optargs=\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 e3a01ad..87d3a27 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -146,8 +146,6 @@
 #define CONFIG_SYS_NAND_ECCSIZE                512
 #define CONFIG_SYS_NAND_ECCBYTES       26
 #define NANDARGS \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "root=${nandroot} " \

diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index 65b0a57..d8f18d0 100644 (file)
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -65,14 +65,6 @@
                "0 /lib/firmware/am65x-mcu-r5f0_0-fw "                  \
                "1 /lib/firmware/am65x-mcu-r5f0_1-fw "
 
-#ifdef CONFIG_TARGET_AM654_A53_EVM
-#define EXTRA_ENV_AM65X_BOARD_SETTINGS_MTD                             \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                            \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
-#else
-#define EXTRA_ENV_AM65X_BOARD_SETTINGS_MTD
-#endif
-
 #define EXTRA_ENV_AM65X_BOARD_SETTINGS_UBI                             \
        "init_ubi=run args_all args_ubi; sf probe; "                    \
                "ubi part ospi.rootfs; ubifsmount ubi:rootfs;\0"        \
@@ -104,7 +96,6 @@
        DEFAULT_FIT_TI_ARGS                                             \
        EXTRA_ENV_AM65X_BOARD_SETTINGS                                  \
        EXTRA_ENV_AM65X_BOARD_SETTINGS_MMC                              \
-       EXTRA_ENV_AM65X_BOARD_SETTINGS_MTD                              \
        EXTRA_ENV_AM65X_BOARD_SETTINGS_UBI                              \
        EXTRA_ENV_RPROC_SETTINGS                                        \
        EXTRA_ENV_DFUARGS                                               \

diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 0c44f74..8997c6a 100644 (file)
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -110,9 +110,6 @@
        "splashpos=m,m\0" \
        "console=" CONSOLE_DEV "\0" \
        "emmcroot=/dev/mmcblk1p1 rootwait rw\0" \
-       "mtdids=nor0=spi0.0\0" \
-       "mtdparts=mtdparts=spi0.0:832k(u-boot),64k(env),64k(env-red)," \
-               "-(ubi-nor)\0" \
        "mk_fitfile_path=setenv fit_file /${sysnum}/system.itb\0" \
        "mk_rescue_fitfile_path=setenv rescue_fit_file /${rescue_sysnum}/system.itb\0" \
        "mk_uboot_path=setenv uboot /${sysnum}/u-boot.imx\0" \

diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index abcddc3..29affe7 100644 (file)
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -36,7 +36,6 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                       \
        "console=console=ttyS0,115200\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 1abda08..25906e4 100644 (file)
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -29,8 +29,6 @@
 #ifdef CONFIG_MTD_RAW_NAND
 
 #define NANDARGS \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "${mtdparts} " \

diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h
index 5311dc4..925a687 100644 (file)
--- a/include/configs/bk4r1.h
+++ b/include/configs/bk4r1.h
@@ -80,7 +80,6 @@
        "nfs_root=/path/to/nfs/root\0" \
        "tftptimeout=1000\0" \
        "tftptimeoutcountmax=1000000\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "ipaddr=192.168.0.60\0" \
        "serverip=192.168.0.1\0" \
        "bootargs_base=setenv bootargs rw " \

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index d7755b8..c046fcb 100644 (file)
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -39,8 +39,6 @@
 
 #ifdef CONFIG_MTD_RAW_NAND
 #define NANDTGTS \
-"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
 "cfgscr=mw ${dtbaddr} 0; nand read ${cfgaddr} cfgscr && source ${cfgaddr};" \
 " fdt addr ${dtbaddr} || cp ${fdtcontroladdr} ${dtbaddr} 4000\0" \
 "nandargs=setenv bootargs console=${console} ${optargs} ${optargs_rot} " \

diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index 8bad0f9..97adb83 100644 (file)
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -13,8 +13,6 @@
 #define V_SCLK                         (V_OSCK)
 
 #define NANDARGS \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} ${optargs} " \
                "${mtdparts} " \
                "root=${nandroot} " \

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 3bb00a3..cbba726 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -53,8 +53,6 @@
        "video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \
        "doboot=bootm ${kernel_addr_r}\0" \
        "doloadfdt=false\0" \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "setboottypez=setenv kernel ${zImage};" \
                "setenv doboot bootz ${kernel_addr_r} - ${fdt_addr_r};" \
                "setenv doloadfdt true;\0" \

diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index b81c3af..4baf7f7 100644 (file)
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -31,8 +31,6 @@
                "bootm ${loadaddr}\0"
 
 #define NANDARGS \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandroot=ubi0:rootfs rw\0" \
        "nandrootfstype=ubifs\0" \
        "nandargs=setenv bootargs console=${console} " \

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index bf02061..528c7c9 100644 (file)
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -65,7 +65,6 @@
 #define DFU_ALT_NAND_INFO "imx6ull-bcb part 0,1;u-boot1 part 0,2;u-boot2 part 0,3;u-boot-env part 0,4;ubi partubi 0,5"
 #define MODULE_EXTRA_ENV_SETTINGS \
        "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        UBI_BOOTCMD
 #else
 #define        MODULE_EXTRA_ENV_SETTINGS ""

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index c8884e6..8a6536e 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -102,7 +102,6 @@
 
 #if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
 #define MODULE_EXTRA_ENV_SETTINGS \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        UBI_BOOTCMD
 #elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
 #define MODULE_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 1e6561d..73d1844 100644 (file)
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -25,7 +25,6 @@
 /* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */
 #define BOARD_EXTRA_ENV_SETTINGS \
        "boot_script_dhcp=boot.scr\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        UBOOT_UPDATE
 
 #include "tegra-common-post.h"

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 7d2b7de..268afbb 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -68,7 +68,6 @@
        "fdt_board=eval-v3\0" \
        "fdt_fixup=;\0" \
        "kernel_image=zImage\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "setsdupdate=mmc rescan && set interface mmc && " \
                "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \

diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index af2d3b6..015bc78 100644 (file)
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -41,7 +41,6 @@
        "stderr=serial\0" \
        "loadaddr=0x800000\0" \
        "console=ttyS0,115200\0" \
-       "mtdparts="CONFIG_MTDPARTS_DEFAULT \
        "optargs=\0" \
        "bootenv=uEnv.txt\0" \
        "importbootenv=echo Importing environment ...; " \

diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 381a189..33ae7d6 100644 (file)
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -24,8 +24,6 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0" \
-       "mtdids=nand0=orion_nand\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT \
        "kernel=/boot/uImage\0" \
        "initrd=/boot/uInitrd\0" \
        "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"

diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index d335a42..66eed9e 100644 (file)
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -33,8 +33,6 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0" \
-       "mtdids=nand0=orion_nand\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT \
        "kernel=/boot/uImage\0" \
        "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0"
 

diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index d5655e4..4954c5c 100644 (file)
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -26,7 +26,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"                                \
        "mtdids=nand0=orion_nand\0"                                     \
-       "mtdparts="CONFIG_MTDPARTS_DEFAULT                      \
        "kernel=/boot/zImage\0"                                         \
        "fdt=/boot/guruplug-server-plus.dtb\0"                          \
        "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 251e360..77f4150 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -85,8 +85,6 @@
        "hwconfig=_UNKNOWN_\0" \
        "video=\0" \
        \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
        "disk=0\0" \
        "part=1\0" \
        \

diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index aff948c..0519221 100644 (file)
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -20,8 +20,6 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"                                \
-       "mtdids=nand0=orion_nand\0"                                     \
-       "mtdparts="CONFIG_MTDPARTS_DEFAULT                      \
        "kernel=/boot/zImage\0"                                         \
        "fdt=/boot/ib62x0.dtb\0"                                        \
        "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"

diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index cb4cf9b..f2e3608 100644 (file)
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -13,8 +13,6 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"        \
-       "mtdids=nand0=orion_nand\0"             \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT     \
        "kernel=/boot/uImage\0"                 \
        "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
 

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index aa6a471..e0994d1 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -244,8 +244,6 @@
                        "${netmask}:${hostname}:${netdev}:off "         \
                        "console=${console},${baudrate} ${othbootargs}\0" \
        "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"              \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                                    \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"                                \
        "\0"
 
 /* UBI Support */

diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 40c0f1f..17430f1 100644 (file)
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -132,8 +132,6 @@
                " +${filesize};cp.b ${fileaddr} "                       \
                __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0"   \
        "upd=run load update\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/imx8mn_bsh_smm_s2.h b/include/configs/imx8mn_bsh_smm_s2.h
index f752978..84c1982 100644 (file)
--- a/include/configs/imx8mn_bsh_smm_s2.h
+++ b/include/configs/imx8mn_bsh_smm_s2.h
@@ -14,8 +14,6 @@
 #include <config_distro_bootcmd.h>
 
 #define NANDARGS \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "root=${nandroot} " \

diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index c0b5255..ecf8764 100644 (file)
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -151,14 +151,6 @@
        DFU_ALT_INFO_RAM \
        DFU_ALT_INFO_OSPI
 
-#if defined(CONFIG_TARGET_J721E_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM)
-#define EXTRA_ENV_J721E_BOARD_SETTINGS_MTD                             \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                            \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
-#else
-#define EXTRA_ENV_J721E_BOARD_SETTINGS_MTD
-#endif
-
 #if CONFIG_IS_ENABLED(CMD_PXE)
 # define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
 #else
@@ -189,7 +181,6 @@
        EXTRA_ENV_RPROC_SETTINGS                                        \
        EXTRA_ENV_DFUARGS                                               \
        DEFAULT_UFS_TI_ARGS                                             \
-       EXTRA_ENV_J721E_BOARD_SETTINGS_MTD                              \
        EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY                          \
        BOOTENV
 

diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h
index 8e3ea67..4c3a155 100644 (file)
--- a/include/configs/j721s2_evm.h
+++ b/include/configs/j721s2_evm.h
@@ -128,14 +128,6 @@
        DFU_ALT_INFO_RAM \
        DFU_ALT_INFO_OSPI
 
-#if defined(CONFIG_TARGET_J721S2_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM)
-#define EXTRA_ENV_J721S2_BOARD_SETTINGS_MTD                            \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                            \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
-#else
-#define EXTRA_ENV_J721S2_BOARD_SETTINGS_MTD
-#endif
-
 /* Incorporate settings into the U-Boot environment */
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        DEFAULT_LINUX_BOOT_ENV                                          \
@@ -146,7 +138,6 @@
        EXTRA_ENV_RPROC_SETTINGS                                        \
        EXTRA_ENV_DFUARGS                                               \
        DEFAULT_UFS_TI_ARGS                                             \
-       EXTRA_ENV_J721S2_BOARD_SETTINGS_MTD                             \
        EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY
 
 /* Now for the remaining common defines */

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 4bca1a7..1bfc89b 100644 (file)
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -171,8 +171,6 @@
        "init=/sbin/init-overlay.sh\0"                                  \
        "load_addr_r=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0"          \
        "load=tftpboot ${load_addr_r} ${u-boot}\0"                      \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                                    \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"                                \
        ""
 #endif /* CONFIG_KM_DEF_ENV */
 

diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h
index 5270363..2539115 100644 (file)
--- a/include/configs/ls1028aqds.h
+++ b/include/configs/ls1028aqds.h
@@ -87,7 +87,6 @@
        "kernelhdr_addr_sd=0x3000\0" \
        "kernelhdr_size_sd=0x10\0" \
        "console=ttyS0,115200\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        BOOTENV \
        "boot_scripts=ls1028aqds_boot.scr\0" \
        "boot_script_hdr=hdr_ls1028aqds_bs.out\0" \

diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h
index 665723b..e7b2543 100644 (file)
--- a/include/configs/ls1028ardb.h
+++ b/include/configs/ls1028ardb.h
@@ -82,7 +82,6 @@
        "kernelhdr_addr_sd=0x3000\0"            \
        "kernelhdr_size_sd=0x20\0"              \
        "console=ttyS0,115200\0"                \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"        \
        BOOTENV                                 \
        "boot_scripts=ls1028ardb_boot.scr\0"    \
        "boot_script_hdr=hdr_ls1028ardb_bs.out\0"       \

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 6e2c048..8363969 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -167,7 +167,6 @@
        "kernelhdr_size_sd=0x10\0"              \
        "console=ttyS0,115200\0"                \
        "boot_os=y\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/m53menlo.h b/include/configs/m53menlo.h
index 1533e57..b3348bc 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -112,8 +112,6 @@
        "mmcpart=1\0"                                                   \
        "rootpath=/srv/\0"                                              \
        "kernel_addr_r=0x72000000\0"                                    \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                            \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"                        \
        "netdev=eth0\0"                                                 \
        "splashsource=mmc_fs\0"                                         \
        "splashfile=boot/usplash.bmp.gz\0"                              \

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 2c862e9..02a2235 100644 (file)
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -109,7 +109,6 @@
                          "fi;" \
                     "fi;" \
                "fi\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "bootdev=1\0" \
        "bootpart=1\0" \
        "netdev=eth0\0" \

diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index f7dd31e..b968923 100644 (file)
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -39,8 +39,6 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0,115200n8\0" \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "fdt_addr_r=0x82000000\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \

diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index a8a905d..1b7eb34 100644 (file)
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -37,11 +37,6 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "bootargs=console=ttyS0,115200\0" \
-       "mtdparts=mtdparts=orion_nand:0xa0000@0x0(uboot),"\
-       "0x010000@0xa0000(env),"\
-       "0x500000@0xc0000(uimage),"\
-       "0x1a40000@0x5c0000(rootfs)\0" \
-       "mtdids=nand0=orion_nand\0"\
        "autostart=no\0"
 
 /*

diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 96f570a..6cdb1af 100644 (file)
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -48,8 +48,6 @@
        "console=ttymxc0,115200n8\0" \
        "image=zImage\0" \
        "fdtfile=imx6ull-seeed-npi-dev-board.dtb\0" \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "fdt_addr_r=0x82000000\0" \
        "kernel_addr_r=0x81000000\0" \
        "pxefile_addr_r=0x87100000\0" \

diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 46fd6e6..027a47b 100644 (file)
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -15,8 +15,6 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0" \
-       "mtdids=nand0=orion_nand\0" \
-       "mtdparts="CONFIG_MTDPARTS_DEFAULT \
        "kernel=/boot/zImage\0" \
        "fdt=/boot/nsa310s.dtb\0" \
        "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 9c4e172..1b94f8e 100644 (file)
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -76,8 +76,6 @@
        DEFAULT_MMC_TI_ARGS \
        DEFAULT_FIT_TI_ARGS \
        "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "fdt_high=0xffffffff\0" \
        "console=ttyO0,115200n8\0" \
        "bootdir=/boot\0" \

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index ef55a62..38dc7ea 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -35,8 +35,6 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"    \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "mmcdev=0\0" \
        "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
        "mmcrootfstype=ext4 rootwait\0" \

diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index a07d351..6683f21 100644 (file)
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -51,8 +51,6 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0,115200n8\0" \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "fdt_addr_r=0x82000000\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \

diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index bc4a59b..a8cfec9 100644 (file)
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -49,7 +49,6 @@
        "nfs_root=/path/to/nfs/root\0" \
        "tftptimeout=1000\0" \
        "tftptimeoutcountmax=1000000\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 e87b640..cff71df 100644 (file)
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -37,8 +37,6 @@
        "mmcboot=run mmcloadfit;run mmcargs;bootm ${loadaddr}\0"
 
 #define ENV_NAND \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandroot=ubi0:root ubi.mtd=rootfs\0" \
        "nandrootfstype=ubifs\0" \
        "nandargs=setenv bootargs root=${nandroot} " \

diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h
index 7fa9116..f69d8ad 100644 (file)
--- a/include/configs/phycore_am335x_r2.h
+++ b/include/configs/phycore_am335x_r2.h
@@ -16,8 +16,6 @@
 
 #ifdef CONFIG_MTD_RAW_NAND
 #define NANDARGS \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "root=${nandroot} " \

diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 921f92b..bc15cdb 100644 (file)
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -161,8 +161,6 @@
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
 
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
-       "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 c6b106c..a0eed66 100644 (file)
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -184,8 +184,6 @@
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
 
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
-       "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/pogo_e02.h b/include/configs/pogo_e02.h
index cb22150..0857322 100644 (file)
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -19,9 +19,6 @@
  */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \
-       "32M(rootfs),-(data)\0"\
-       "mtdids=nand0=orion_nand\0"\
        "bootargs_console=console=ttyS0,115200\0" \
        "bootcmd_usb=usb start; ext2load usb 0:1 0x00800000 /uImage; " \
        "ext2load usb 0:1 0x01100000 /uInitrd\0"

diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h
index 24cbf6b..7fff78b 100644 (file)
--- a/include/configs/pogo_v4.h
+++ b/include/configs/pogo_v4.h
@@ -26,8 +26,6 @@
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "dtb_file=/boot/dts/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"\
-       "mtdids=nand0=orion_nand\0"\
        "bootargs_console=console=ttyS0,115200\0" \
        "bootcmd_usb=usb start; load usb 0:1 0x00800000 /boot/uImage; " \
        "load usb 0:1 0x01100000 /boot/uInitrd; " \

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 3b94b17..ab4fe6b 100644 (file)
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -75,7 +75,6 @@
        "verify=n\0" \
        "rootfstype=ext4\0" \
        "console=console=ttySAC1,115200n8\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT \
        "mbrparts=" MBRPARTS_DEFAULT \
        "meminfo=crashkernel=32M@0x50000000\0" \
        "nfsroot=/nfsroot/arm\0" \

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index b86b05b..215c31b 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -92,7 +92,6 @@
                                                                        \
        "basicargs=console=ttyS0,115200\0"                              \
                                                                        \
-       "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0"
 
 /*
  * Initial stack pointer: 4k - GENERATED_GBL_DATA_SIZE in internal SRAM,

diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 9a9f3fe..a7b0ce9 100644 (file)
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -69,7 +69,6 @@
                " console=ttySAC0,115200n8 mem=128M" \
                " initrd=0x33000000,8M ramdisk=8192\0" \
        "rootfstype=cramfs\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "meminfo=mem=128M\0" \
        "nfsroot=/nfsroot/arm\0" \
        "bootblock=5\0" \

diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h
index 3a77c71..2d654b4 100644 (file)
--- a/include/configs/socfpga_arria5_secu1.h
+++ b/include/configs/socfpga_arria5_secu1.h
@@ -66,8 +66,6 @@
        "fdt_addr=" __stringify(CONFIG_KM_FDT_ADDR) "\0" \
        "load=tftpboot ${loadaddr} u-boot-with-nand-spl.sfp\0" \
        "loadaddr=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0" \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "update=nand erase 0x0 0x00100000 && nand write ${loadaddr} 0x0 ${filesize}\0" \
        "userload=ubi part nand.ubi &&" \
                "ubi check rootfs$bootnum &&" \

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 1f77b7b..d52552c 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -317,20 +317,6 @@
        "stderr=serial\0"
 #endif
 
-#ifdef CONFIG_MTDIDS_DEFAULT
-#define SUNXI_MTDIDS_DEFAULT \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"
-#else
-#define SUNXI_MTDIDS_DEFAULT
-#endif
-
-#ifdef CONFIG_MTDPARTS_DEFAULT
-#define SUNXI_MTDPARTS_DEFAULT \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
-#else
-#define SUNXI_MTDPARTS_DEFAULT
-#endif
-
 #define PARTS_DEFAULT \
        "name=loader1,start=8k,size=32k,uuid=${uuid_gpt_loader1};" \
        "name=loader2,size=984k,uuid=${uuid_gpt_loader2};" \
@@ -362,8 +348,6 @@
        DFU_ALT_INFO_RAM \
        "fdtfile=" FDTFILE "\0" \
        "console=ttyS0,115200\0" \
-       SUNXI_MTDIDS_DEFAULT \
-       SUNXI_MTDPARTS_DEFAULT \
        "uuid_gpt_esp=" UUID_GPT_ESP "\0" \
        "uuid_gpt_system=" UUID_GPT_SYSTEM "\0" \
        "partitions=" PARTS_DEFAULT "\0" \

diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index fa5d910..1aca83a 100644 (file)
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -13,9 +13,7 @@
 #include <asm/arch/omap.h>
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-       DEFAULT_LINUX_BOOT_ENV \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
+       DEFAULT_LINUX_BOOT_ENV
 
 /* Clock Defines */
 #define V_OSCK          24000000    /* Clock output from T2 */

diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 6952cc6..bf76afa 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -184,9 +184,7 @@
        "args_ramfs=setenv bootargs ${bootargs} "                       \
                "rdinit=/sbin/init rw root=/dev/ram0 "                  \
                "initrd=0x808080000,80M\0"                              \
-       "no_post=1\0"                                                   \
-       "mtdparts=mtdparts=davinci_nand.0:"                             \
-               "1024k(bootloader)ro,512k(params)ro,-(ubifs)\0"
+       "no_post=1\0"
 
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>

diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 32e8f6b..e432b04 100644 (file)
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -55,6 +55,5 @@
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
 
 #endif

diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h
index 88c3061..43127ae 100644 (file)
--- a/include/configs/vcoreiii.h
+++ b/include/configs/vcoreiii.h
@@ -32,18 +32,9 @@
 #error Unknown DDR size - please add!
 #endif
 
-#if defined(CONFIG_MTDIDS_DEFAULT) && defined(CONFIG_MTDPARTS_DEFAULT)
-#define VCOREIII_DEFAULT_MTD_ENV                   \
-       "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0"      \
-       "mtdids="CONFIG_MTDIDS_DEFAULT"\0"
-#else
-#define VCOREIII_DEFAULT_MTD_ENV    /* Go away */
-#endif
-
 #define CONFIG_SYS_BOOTM_LEN      (16 << 20)      /* Increase max gunzip size */
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
-       VCOREIII_DEFAULT_MTD_ENV                                        \
        "loadaddr=0x81000000\0"                                         \
        "spi_image_off=0x00100000\0"                                    \
        "console=ttyS0,115200\0"                                        \

diff --git a/include/env_default.h b/include/env_default.h
index d1508b3..4e461c8 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -108,6 +108,12 @@ const char default_environment[] = {
 #if defined(CONFIG_BOOTCOUNT_BOOTLIMIT) && (CONFIG_BOOTCOUNT_BOOTLIMIT > 0)
        "bootlimit="    __stringify(CONFIG_BOOTCOUNT_BOOTLIMIT)"\0"
 #endif
+#ifdef CONFIG_MTDIDS_DEFAULT
+        "mtdids="      CONFIG_MTDIDS_DEFAULT           "\0"
+#endif
+#ifdef CONFIG_MTDPARTS_DEFAULT
+       "mtdparts="     CONFIG_MTDPARTS_DEFAULT         "\0"
+#endif
 #ifdef CONFIG_EXTRA_ENV_TEXT
        /* This is created in the Makefile */
        CONFIG_EXTRA_ENV_TEXT