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 0c67367a5fc93de12a0fa816a9d41c9429116557..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>
 
@@ -104,8 +106,9 @@ void usb_board_stop(void)
 
 int board_init (void)
 {
-       /* memory and cpu-speed are setup before relocation */
-       /* so we do _nothing_ here */
+       /* We have RAM, disable cache */
+       dcache_disable();
+       icache_disable();
 
        /* arch number of ConXS Board */
        gd->bd->bi_arch_number = 776;
@@ -118,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") &&
@@ -129,27 +131,20 @@ int board_late_init(void)
        setenv("stdout",console);
        setenv("stdin", console);
        setenv("stderr",console);
-#endif
        return 0;
 }
 
-struct serial_device *default_serial_console (void)
+int dram_init(void)
 {
-       return &serial_ffuart_device;
+       pxa2xx_dram_init();
+       gd->ram_size = PHYS_SDRAM_1_SIZE;
+       return 0;
 }
 
-int dram_init (void)
+void dram_init_banksize(void)
 {
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-       gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
-       gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
-       gd->bd->bi_dram[2].start = PHYS_SDRAM_3;
-       gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE;
-       gd->bd->bi_dram[3].start = PHYS_SDRAM_4;
-       gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE;
-
-       return 0;
 }
 
 #ifdef CONFIG_DRIVER_DM9000
@@ -158,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