tricorder: add mtdparts to environment
authorAndreas Bießmann <andreas.biessmann@corscience.de>
Fri, 6 Sep 2013 13:04:51 +0000 (15:04 +0200)
committerTom Rini <trini@ti.com>
Fri, 1 Nov 2013 19:55:58 +0000 (15:55 -0400)
Before we always ran 'mtdparts default' which also set the mtdparts and mtdids
environment. But if we changed that values by intention we will overwrite
them with our default values. This is obviously bad!

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
include/configs/tricorder.h

index 6d93cb0..ec900e5 100644 (file)
        "vram=3M\0" \
        "defaultdisplay=lcd\0" \
        "kernelopts=mtdoops.mtddev=3\0" \
        "vram=3M\0" \
        "defaultdisplay=lcd\0" \
        "kernelopts=mtdoops.mtddev=3\0" \
+       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" MTDIDS_DEFAULT "\0" \
        "commonargs=" \
                "setenv bootargs console=${console} " \
                "${mtdparts} " \
        "commonargs=" \
                "setenv bootargs console=${console} " \
                "${mtdparts} " \
        CONFIG_COMMON_ENV_SETTINGS \
        CONFIG_ENV_RDADDR \
        "autoboot=" \
        CONFIG_COMMON_ENV_SETTINGS \
        CONFIG_ENV_RDADDR \
        "autoboot=" \
-       "mtdparts default; " \
        "run commonargs; " \
        "setenv bootargs ${bootargs} " \
                "flashy_updateimg=/dev/mmcblk0p1:corscience_update.img " \
        "run commonargs; " \
        "setenv bootargs ${bootargs} " \
                "flashy_updateimg=/dev/mmcblk0p1:corscience_update.img " \
        "mmcboot=echo Booting from mmc ...; " \
                "run mmcargs; " \
                "bootm ${loadaddr}\0" \
        "mmcboot=echo Booting from mmc ...; " \
                "run mmcargs; " \
                "bootm ${loadaddr}\0" \
-       "loaduimage_ubi=mtd default; " \
-               "ubi part ubi; " \
+       "loaduimage_ubi=ubi part ubi; " \
                "ubifsmount ubi:root; " \
                "ubifsload ${loadaddr} /boot/uImage\0" \
        "nandboot=echo Booting from nand ...; " \
                "run nandargs; " \
                "run loaduimage_ubi; " \
                "bootm ${loadaddr}\0" \
                "ubifsmount ubi:root; " \
                "ubifsload ${loadaddr} /boot/uImage\0" \
        "nandboot=echo Booting from nand ...; " \
                "run nandargs; " \
                "run loaduimage_ubi; " \
                "bootm ${loadaddr}\0" \
-       "autoboot=mtdparts default;" \
-                       "mmc dev ${mmcdev}; if mmc rescan; then " \
+       "autoboot=mmc dev ${mmcdev}; if mmc rescan; then " \
                        "if run loadbootscript; then " \
                                "run bootscript; " \
                        "else " \
                        "if run loadbootscript; then " \
                                "run bootscript; " \
                        "else " \