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

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

diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c
index e2b38a620565ee622b38047391f171bf5ac2c2b4..71e9b088acdc1e6f388d479013791117db51e1b6 100644 (file)
--- a/board/stxssa/stxssa.c
+++ b/board/stxssa/stxssa.c
@@ -29,16 +29,17 @@
  */
 
 
-extern long int spd_sdram (void);
-
 #include <common.h>
 #include <pci.h>
 #include <asm/processor.h>
+#include <asm/mmu.h>
 #include <asm/immap_85xx.h>
+#include <asm/fsl_ddr_sdram.h>
 #include <ioports.h>
 #include <asm/io.h>
-#include <spd.h>
+#include <spd_sdram.h>
 #include <miiphy.h>
+#include <netdev.h>
 
 long int fixed_sdram (void);
 
@@ -293,11 +294,10 @@ show_activity(int flag)
        next_led_update += (get_tbclk() / 4);
 }
 
-long int
+phys_size_t
 initdram (int board_type)
 {
        long dram_size = 0;
-       extern long spd_sdram (void);
 
 #if defined(CONFIG_DDR_DLL)
        {
@@ -311,7 +311,9 @@ initdram (int board_type)
        }
 #endif
 
-       dram_size = spd_sdram ();
+       dram_size = fsl_ddr_sdram();
+       dram_size = setup_ddr_tlbs(dram_size / 0x100000);
+       dram_size *= 0x100000;
 
 #if defined(CONFIG_DDR_ECC)
        /* Initialize and enable DDR ECC.
@@ -399,3 +401,10 @@ pci_init_board(void)
        pci_mpc85xx_init(hose);
 #endif /* CONFIG_PCI */
 }
+
+int board_eth_init(bd_t *bis)
+{
+       cpu_eth_init(bis);      /* Initialize TSECs first */
+       return pci_eth_init(bis);
+}
+