DaVinci: rename gpio_defs.h to gpio.h

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

diff --git a/board/vpac270/vpac270.c b/board/vpac270/vpac270.c
index f91ff97b2c4a820fae10fc03e3d004a98758d627..43bbdff70e23fb4d5bb1a644552be130bb733d47 100644 (file)
--- a/board/vpac270/vpac270.c
+++ b/board/vpac270/vpac270.c
@@ -32,6 +32,10 @@ DECLARE_GLOBAL_DATA_PTR;
  */
 int board_init(void)
 {
+       /* We have RAM, disable cache */
+       dcache_disable();
+       icache_disable();
+
        /* memory and cpu-speed are setup before relocation */
        /* so we do _nothing_ here */
 
@@ -49,13 +53,11 @@ struct serial_device *default_serial_console(void)
        return &serial_ffuart_device;
 }
 
-
+extern void pxa_dram_init(void);
 int dram_init(void)
 {
+       pxa_dram_init();
        gd->ram_size = PHYS_SDRAM_1_SIZE;
-#ifdef CONFIG_256M_U_BOOT
-       gd->ram_size += PHYS_SDRAM_2_SIZE;
-#endif
        return 0;
 }
 
@@ -64,7 +66,7 @@ void dram_init_banksize(void)
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
 
-#ifdef CONFIG_256M_U_BOOT
+#ifdef CONFIG_RAM_256M
        gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
        gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
 #endif