powerpc/83xx/km: MV88e6122 errata fix for 1.9V

[u-boot] / board / trizepsiv / conxs.c

diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c
index 99f665b47273092d2da96a41fcc224cf6c5d1001..c3dee8459e68a2ab166dc3f0426f2f4ead7253b9 100644 (file)
--- a/board/trizepsiv/conxs.c
+++ b/board/trizepsiv/conxs.c
@@ -33,6 +33,8 @@
 
 #include <common.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/arch/pxa.h>
+#include <asm/arch/regs-mmc.h>
 #include <netdev.h>
 #include <asm/io.h>
 
@@ -119,7 +121,6 @@ int board_init (void)
 
 int board_late_init(void)
 {
-#if defined(CONFIG_SERIAL_MULTI)
        char *console=getenv("boot_console");
 
        if ((console == NULL) || (strcmp(console,"serial_btuart") &&
@@ -130,19 +131,12 @@ int board_late_init(void)
        setenv("stdout",console);
        setenv("stdin", console);
        setenv("stderr",console);
-#endif
        return 0;
 }
 
-struct serial_device *default_serial_console (void)
-{
-       return &serial_ffuart_device;
-}
-
-extern void pxa_dram_init(void);
 int dram_init(void)
 {
-       pxa_dram_init();
+       pxa2xx_dram_init();
        gd->ram_size = PHYS_SDRAM_1_SIZE;
        return 0;
 }
@@ -159,3 +153,11 @@ int board_eth_init(bd_t *bis)
        return dm9000_initialize(bis);
 }
 #endif
+
+#ifdef CONFIG_CMD_MMC
+int board_mmc_init(bd_t *bis)
+{
+       pxa_mmc_register(0);
+       return 0;
+}
+#endif