zipitz2: use pxa_mmc_gen as MMC driver

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>

diff --git a/board/zipitz2/zipitz2.c b/board/zipitz2/zipitz2.c
index b093c2f51f89fb73a129d5aa764f3a60472f79ef..4075fb659c5de8cf3ad92a659ce3ded13ea09b8a 100644 (file)
--- a/board/zipitz2/zipitz2.c
+++ b/board/zipitz2/zipitz2.c
@@ -79,6 +79,14 @@ void dram_init_banksize(void)
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
 }
 
+#ifdef CONFIG_CMD_MMC
+int board_mmc_init(bd_t *bis)
+{
+       pxa_mmc_register(0);
+       return 0;
+}
+#endif
+
 #ifdef CONFIG_CMD_SPI
 
 struct {

diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 80d78b67170d73664e79c854b2e46a267c62831a..afe1e891ddaf415b5c5691d1138e5f946a7d3637 100644 (file)
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -45,7 +45,8 @@
 #define        CONFIG_ARCH_CPU_INIT
 
 #define        CONFIG_BOOTCOMMAND                                              \
-       "if mmc init && fatload mmc 0 0xa0000000 uboot.script ; then "  \
+       "if mmc rescan && ext2load mmc 0 0xa0000000 boot/uboot.script ;"\
+       "then "                                                         \
                "source 0xa0000000; "                                   \
        "else "                                                         \
                "bootm 0x60000; "                                       \
@@ -85,7 +86,8 @@
  */
 #ifdef CONFIG_CMD_MMC
 #define        CONFIG_MMC
-#define        CONFIG_PXA_MMC
+#define        CONFIG_GENERIC_MMC
+#define        CONFIG_PXA_MMC_GENERIC
 #define        CONFIG_SYS_MMC_BASE             0xF0000000
 #define        CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2