Merge remote-tracking branch 'u-boot-atmel/master'

[u-boot] / board / palmtc / palmtc.c

diff --git a/board/palmtc/palmtc.c b/board/palmtc/palmtc.c
index 25186aefa8c1360014e5c3bf90b2e7fee2a85a0f..590ca414aab8668fd73589d7e804062935723040 100644 (file)
--- a/board/palmtc/palmtc.c
+++ b/board/palmtc/palmtc.c
@@ -23,6 +23,8 @@
 #include <command.h>
 #include <serial.h>
 #include <asm/io.h>
+#include <asm/arch/pxa.h>
+#include <asm/arch/regs-mmc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -50,15 +52,17 @@ int board_init(void)
        return 0;
 }
 
-struct serial_device *default_serial_console(void)
+#ifdef CONFIG_CMD_MMC
+int board_mmc_init(bd_t *bis)
 {
-       return &serial_ffuart_device;
+       pxa_mmc_register(0);
+       return 0;
 }
+#endif
 
-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;
 }