summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSukumar Ghorai <s-ghorai@ti.com>2010-09-18 20:56:18 -0700
committerWolfgang Denk <wd@denx.de>2010-10-17 20:14:13 +0200
commit7e982c956d74614fc59cacf39016fad8bbb194ed (patch)
treee4467420fbb193e76e6551afbb460bc9d35efc44 /include
parentde941241a0d6a5f00e3273112c2cf8535e4f15af (diff)
downloadu-boot-imx-7e982c956d74614fc59cacf39016fad8bbb194ed.zip
u-boot-imx-7e982c956d74614fc59cacf39016fad8bbb194ed.tar.gz
u-boot-imx-7e982c956d74614fc59cacf39016fad8bbb194ed.tar.bz2
ARMV7: OMAP4: Use generic mmc driver on Panda
This patch switches from the legacy mmc driver to the new generic mmc driver Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com> Tested-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/omap4_panda.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
index d4a1d1c..2618f7d 100644
--- a/include/configs/omap4_panda.h
+++ b/include/configs/omap4_panda.h
@@ -89,7 +89,6 @@
#define CONFIG_SYS_NS16550_COM3 UART3_BASE
#define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_OVERWRITE
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
115200}
@@ -107,8 +106,9 @@
#define CONFIG_TWL6030_POWER 1
/* MMC */
+#define CONFIG_GENERIC_MMC 1
#define CONFIG_MMC 1
-#define CONFIG_OMAP3_MMC 1
+#define CONFIG_OMAP_HSMMC 1
#define CONFIG_SYS_MMC_SET_DEV 1
#define CONFIG_DOS_PARTITION 1
@@ -150,7 +150,6 @@
#define CONFIG_BOOTDELAY 3
-/* allow overwriting serial config and ethaddr */
#define CONFIG_ENV_OVERWRITE
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -158,7 +157,7 @@
"console=ttyS2,115200n8\0" \
"usbtty=cdc_acm\0" \
"vram=16M\0" \
- "mmcdev=1\0" \
+ "mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 rw\0" \
"mmcrootfstype=ext3 rootwait\0" \
"mmcargs=setenv bootargs console=${console} " \
@@ -174,7 +173,7 @@
"bootm ${loadaddr}\0" \
#define CONFIG_BOOTCOMMAND \
- "if mmc init ${mmcdev}; then " \
+ "if mmc rescan ${mmcdev}; then " \
"if run loadbootscript; then " \
"run bootscript; " \
"else " \