]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Tricorder: Switch env to generic mmc driver
authorThomas Weber <weber@corscience.de>
Mon, 13 Feb 2012 03:16:53 +0000 (03:16 +0000)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 27 Feb 2012 20:19:24 +0000 (21:19 +0100)
Because the tricorder uses the CONFIG_OMAP_HSMMC the
initialization command is mmc rescan and not mmc init.

Signed-off-by: Thomas Weber <weber@corscience.de>
Signed-off-by: Tom Rini <trini@ti.com>
include/configs/tricorder.h

index f87696b2354d25478d78ec647b1adf01f45eab3a..7451312c0e8a0b2d9419a6d2a8363f9081e4cd85 100644 (file)
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x82000000\0" \
        "console=ttyO2,115200n8\0" \
+       "mmcdev=0\0" \
        "vram=12M\0" \
        "lcdmode=800x600\0" \
        "defaultdisplay=lcd\0" \
                "root=ubi0:rootfs " \
                "rootfstype=ubifs " \
                "${kernelopts}\0" \
-       "loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \
+       "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
        "bootscript=echo Running bootscript from mmc ...; " \
                "source ${loadaddr}\0" \
-       "loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \
+       "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
        "eraseenv=nand unlock 0x260000 0x20000; nand erase 0x260000 0x20000\0" \
        "mmcboot=echo Booting from mmc ...; " \
                "run mmcargs; " \
                "run nandargs; " \
                "nand read ${loadaddr} 280000 400000; " \
                "bootm ${loadaddr}\0" \
-       "autoboot=if mmc init 0; then " \
+       "autoboot=if mmc rescan ${mmcdev}; then " \
                        "if run loadbootscript; then " \
                                "run bootscript; " \
                        "else " \