Skip to contentSkip to conversation

Tricorder: Switch env to generic mmc driver

PATCH New Thomas Weber 2 participants 2 messages Feb 13, 2012 – Feb 14, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 include/configs/tricorder.h |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
include/configs/tricorder.h +4 -3
index a2bff2b..1ef0d43 100644
@@ -161,6 +161,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" \
@@ -183,10 +184,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; " \
@@ -195,7 +196,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 " \
Signature · 1 line
1.7.8.4
#1 lore raw

PATCH 1/1 Tricorder: Switch env to generic mmc driver

Quoted 13 lines · Thomas Weber

Because the tricorder uses the CONFIG_OMAP_HSMMC the initialization command is mmc rescan and not mmc init.

---
?include/configs/tricorder.h | ? ?7 ++++---
?1 files changed, 4 insertions(+), 3 deletions(-)

include/configs/tricorder.h +0 -0
index a2bff2b..1ef0d43 100644

include/configs/tricorder.h line 164

Quoted 4 lines
include/configs/tricorder.h +1 -0
@@ -161,6 +161,7 @@
 ?#define CONFIG_EXTRA_ENV_SETTINGS \
 ? ? ? ?"loadaddr=0x82000000\0" \
 ? ? ? ?"console=ttyO2,115200n8\0" \
+ ? ? ? "mmcdev=0\0"

You forgot a trailing '\' here, but the changes otherwise look correct / complete and it builds with that one change, which I've made and will include in my pull request.

Signature · 1 line
Tom