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

[u-boot] / board / samsung / smdk2410 / smdk2410.c

diff --git a/board/samsung/smdk2410/smdk2410.c b/board/samsung/smdk2410/smdk2410.c
index 802348d23693f8ef25a4fe1299f3908848eb2df3..a8cf2874a92536dd737c5525529c7ef308abca69 100644 (file)
--- a/board/samsung/smdk2410/smdk2410.c
+++ b/board/samsung/smdk2410/smdk2410.c
@@ -26,7 +26,8 @@
  */
 
 #include <common.h>
-#include <s3c2410.h>
+#include <netdev.h>
+#include <asm/arch/s3c2410.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -67,8 +68,9 @@ static inline void delay (unsigned long loops)
 
 int board_init (void)
 {
-       S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
-       S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
+       struct s3c24x0_clock_power * const clk_power =
+                                       s3c24x0_get_base_clock_power();
+       struct s3c24x0_gpio * const gpio = s3c24x0_get_base_gpio();
 
        /* to reduce PLL lock time, adjust the LOCKTIME register */
        clk_power->LOCKTIME = 0xFFFFFF;
@@ -121,3 +123,14 @@ int dram_init (void)
 
        return 0;
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+       int rc = 0;
+#ifdef CONFIG_CS8900
+       rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
+#endif
+       return rc;
+}
+#endif