ARM: versatile: drop warnings

[oweals/u-boot.git] / board / armltd / versatile / versatile.c

diff --git a/board/armltd/versatile/versatile.c b/board/armltd/versatile/versatile.c
index 197bc896ac26db3dd2ae8ea46b61a323014705d3..4a5c31dbf78d06c50ede6bc2ae4f35c6c30dc56b 100644 (file)
--- a/board/armltd/versatile/versatile.c
+++ b/board/armltd/versatile/versatile.c
@@ -34,6 +34,7 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -50,7 +51,7 @@ void show_boot_progress(int progress)
  * Miscellaneous platform dependent initialisations
  */
 
-int board_init (void)
+int board_early_init_f (void)
 {
        /*
         * set clock frequency:
@@ -61,6 +62,11 @@ int board_init (void)
          ((VERSATILE_TIMCLK << VERSATILE_TIMER1_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER2_EnSel) |
           (VERSATILE_TIMCLK << VERSATILE_TIMER3_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER4_EnSel));
 
+       return 0;
+}
+
+int board_init (void)
+{
        /* arch number of Versatile Board */
        gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_PB;
 
@@ -87,5 +93,19 @@ int misc_init_r (void)
 ******************************/
 int dram_init (void)
 {
+       /* dram_init must store complete ramsize in gd->ram_size */
+       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+                               PHYS_SDRAM_1_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