summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorThomas Weber <weber@corscience.de>2012-02-13 03:16:53 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-02-27 21:19:24 +0100
commit5605979abe56868b543217e8f8d4b87f0046dce7 (patch)
treea2977e1f5c8bf310c491eec1aece5ca6b3ebcb2d /include/configs
parent6c11dcd8c389158454ac9a892f8f5c9602c28ce4 (diff)
downloadu-boot-imx-5605979abe56868b543217e8f8d4b87f0046dce7.zip
u-boot-imx-5605979abe56868b543217e8f8d4b87f0046dce7.tar.gz
u-boot-imx-5605979abe56868b543217e8f8d4b87f0046dce7.tar.bz2
Tricorder: Switch env to generic mmc driver
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>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/tricorder.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index f87696b..7451312 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -160,6 +160,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \
"console=ttyO2,115200n8\0" \
+ "mmcdev=0\0" \
"vram=12M\0" \
"lcdmode=800x600\0" \
"defaultdisplay=lcd\0" \
@@ -182,10 +183,10 @@
"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; " \
@@ -194,7 +195,7 @@
"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 " \