Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / board / lubbock / lubbock.c

diff --git a/board/lubbock/lubbock.c b/board/lubbock/lubbock.c
index d8d6ffbf6174fdfc44318a06fc7fb204cd9568ef..437f9447159d5e655bcc2212d42c0d9b41f0b558 100644 (file)
--- a/board/lubbock/lubbock.c
+++ b/board/lubbock/lubbock.c
@@ -27,6 +27,7 @@
 
 #include <common.h>
 #include <netdev.h>
+#include <asm/arch/pxa.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -36,8 +37,9 @@ DECLARE_GLOBAL_DATA_PTR;
 
 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 Lubbock-Board */
        gd->bd->bi_arch_number = MACH_TYPE_LUBBOCK;
@@ -55,19 +57,17 @@ int board_late_init(void)
        return 0;
 }
 
+int dram_init(void)
+{
+       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_CMD_NET