|
@@ -98,8 +98,9 @@
|
|
115200}
|
|
115200}
|
|
|
|
|
|
/* MMC */
|
|
/* MMC */
|
|
|
|
+#define CONFIG_GENERIC_MMC 1
|
|
#define CONFIG_MMC 1
|
|
#define CONFIG_MMC 1
|
|
-#define CONFIG_OMAP3_MMC 1
|
|
|
|
|
|
+#define CONFIG_OMAP_HSMMC 1
|
|
#define CONFIG_DOS_PARTITION 1
|
|
#define CONFIG_DOS_PARTITION 1
|
|
|
|
|
|
/* I2C */
|
|
/* I2C */
|
|
@@ -181,6 +182,7 @@
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"loadaddr=0x82000000\0" \
|
|
"loadaddr=0x82000000\0" \
|
|
"console=ttyS2,115200n8\0" \
|
|
"console=ttyS2,115200n8\0" \
|
|
|
|
+ "mmcdev=0\0" \
|
|
"vram=12M\0" \
|
|
"vram=12M\0" \
|
|
"dvimode=1024x768MR-16@60\0" \
|
|
"dvimode=1024x768MR-16@60\0" \
|
|
"defaultdisplay=dvi\0" \
|
|
"defaultdisplay=dvi\0" \
|
|
@@ -213,10 +215,10 @@
|
|
"${kernelopts} " \
|
|
"${kernelopts} " \
|
|
"dnsip1=${dnsip} " \
|
|
"dnsip1=${dnsip} " \
|
|
"dnsip2=${dnsip2}\0" \
|
|
"dnsip2=${dnsip2}\0" \
|
|
- "loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \
|
|
|
|
|
|
+ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
|
|
"bootscript=echo Running bootscript from mmc ...; " \
|
|
"bootscript=echo Running bootscript from mmc ...; " \
|
|
"source ${loadaddr}\0" \
|
|
"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" \
|
|
"eraseenv=nand unlock 0x260000 0x20000; nand erase 0x260000 0x20000\0" \
|
|
"mmcboot=echo Booting from mmc ...; " \
|
|
"mmcboot=echo Booting from mmc ...; " \
|
|
"run mmcargs; " \
|
|
"run mmcargs; " \
|
|
@@ -229,7 +231,7 @@
|
|
"dhcp ${loadaddr}; " \
|
|
"dhcp ${loadaddr}; " \
|
|
"run netargs; " \
|
|
"run netargs; " \
|
|
"bootm ${loadaddr}\0" \
|
|
"bootm ${loadaddr}\0" \
|
|
- "autoboot=if mmc init 0; then " \
|
|
|
|
|
|
+ "autoboot=if mmc rescan ${mmcdev}; then " \
|
|
"if run loadbootscript; then " \
|
|
"if run loadbootscript; then " \
|
|
"run bootscript; " \
|
|
"run bootscript; " \
|
|
"else " \
|
|
"else " \
|