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

[oweals/u-boot.git] / board / xaeniax / xaeniax.c

diff --git a/board/xaeniax/xaeniax.c b/board/xaeniax/xaeniax.c
index 26fb312fd0a5c7ab77e7df1b6eeac01fda02b94e..40b0f3b30e21b319581350fb58e95da05ec156c4 100644 (file)
--- a/board/xaeniax/xaeniax.c
+++ b/board/xaeniax/xaeniax.c
@@ -29,9 +29,9 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 
-/* ------------------------------------------------------------------------- */
-
+DECLARE_GLOBAL_DATA_PTR;
 
 /*
  * Miscelaneous platform dependent initialisations
@@ -39,10 +39,9 @@
 
 int board_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
-       /* 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 xaeniax */
        gd->bd->bi_arch_number = 585;
@@ -60,19 +59,27 @@ int board_late_init(void)
        return 0;
 }
 
-
-int dram_init (void)
+extern void pxa_dram_init(void);
+int dram_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
+       pxa_dram_init();
+       gd->ram_size = PHYS_SDRAM_1_SIZE;
+       return 0;
+}
 
+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
+int board_eth_init(bd_t *bis)
+{
+       int rc = 0;
+#ifdef CONFIG_SMC91111
+       rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
+#endif
+       return rc;
 }
+#endif