Merge branch 'master' of /home/wd/git/u-boot/master

[oweals/u-boot.git] / board / samsung / smdk2400 / smdk2400.c

diff --git a/board/samsung/smdk2400/smdk2400.c b/board/samsung/smdk2400/smdk2400.c
index 4d1f1a63cd3a711833bc79d9e795ca4095260ea2..895bd7789ab8fc5d0a50dd742dc4ce25ed4c0162 100644 (file)
--- a/board/samsung/smdk2400/smdk2400.c
+++ b/board/samsung/smdk2400/smdk2400.c
@@ -4,7 +4,7 @@
  * Marius Groeger <mgroeger@sysgo.de>
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -26,7 +26,8 @@
  */
 
 #include <common.h>
-#include <s3c2400.h>
+#include <netdev.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -45,35 +46,36 @@ extern int do_mdm_init; /* defined in common/main.c */
 
 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();
 
        /* memory and cpu-speed are setup before relocation */
        /* change the clock to be 50 MHz 1:1:1 */
-       clk_power->MPLLCON = 0x5c042;
-       clk_power->CLKDIVN = 0;
+       clk_power->mpllcon = 0x5c042;
+       clk_power->clkdivn = 0;
        /* set up the I/O ports */
-       gpio->PACON = 0x3ffff;
-       gpio->PBCON = 0xaaaaaaaa;
-       gpio->PBUP = 0xffff;
-       gpio->PECON = 0x0;
-       gpio->PEUP = 0x0;
+       gpio->pacon = 0x3ffff;
+       gpio->pbcon = 0xaaaaaaaa;
+       gpio->pbup = 0xffff;
+       gpio->pecon = 0x0;
+       gpio->peup = 0x0;
 #ifdef CONFIG_HWFLOW
        /*CTS[0] RTS[0] INPUT INPUT TXD[0] INPUT RXD[0] */
        /*   10,   10,   00,   00,    10,   00,    10 */
-       gpio->PFCON=0xa22;
+       gpio->pfcon = 0xa22;
        /* Disable pull-up on Rx, Tx, CTS and RTS pins */
-       gpio->PFUP=0x35;
+       gpio->pfup = 0x35;
 #else
        /*INPUT INPUT INPUT INPUT TXD[0] INPUT RXD[0] */
        /*   00,   00,   00,   00,    10,   00,    10 */
-       gpio->PFCON = 0x22;
+       gpio->pfcon = 0x22;
        /* Disable pull-up on Rx and Tx pins */
-       gpio->PFUP = 0x5;
+       gpio->pfup = 0x5;
 #endif /* CONFIG_HWFLOW */
-       gpio->PGCON = 0x0;
-       gpio->PGUP = 0x0;
-       gpio->OPENCR = 0x0;
+       gpio->pgcon = 0x0;
+       gpio->pgup = 0x0;
+       gpio->opencr = 0x0;
 
        /* arch number of SAMSUNG-Board to MACH_TYPE_SMDK2400 */
        gd->bd->bi_arch_number = MACH_TYPE_SMDK2400;
@@ -110,3 +112,14 @@ static int key_pressed(void)
        return rc;
 }
 #endif /* CONFIG_MODEM_SUPPORT */
+
+#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