fsl_pci: create a SET_STD_PCI_INFO() helper wrapper

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

diff --git a/board/trab/trab.c b/board/trab/trab.c
index 868a899ee90e0002f204b68a306a26407837a222..2dccd87677c4944887af39b7b748ef6f91e1a76a 100644 (file)
--- a/board/trab/trab.c
+++ b/board/trab/trab.c
@@ -1,6 +1,6 @@
 /*
  * (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.
@@ -24,13 +24,14 @@
 /* #define DEBUG */
 
 #include <common.h>
+#include <netdev.h>
 #include <malloc.h>
 #include <s3c2400.h>
 #include <command.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CFG_BRIGHTNESS
+#ifdef CONFIG_SYS_BRIGHTNESS
 static void spi_init(void);
 static void wait_transmit_done(void);
 static void tsc2000_write(unsigned int page, unsigned int reg,
@@ -89,7 +90,7 @@ int board_init ()
        gpio->PBCON = 0xaaaaaaaa;
        gpio->PBUP  = 0xffff;
        /* INPUT nCTS0 nRTS0 TXD[1] TXD[0] RXD[1] RXD[0]        */
-       /*  00,    10,      10,      10,      10,      10,      10      */
+       /*  00,    10,      10,      10,      10,      10,      10      */
        gpio->PFCON = (2<<0) | (2<<2) | (2<<4) | (2<<6) | (2<<8) | (2<<10);
 #ifdef CONFIG_HWFLOW
        /* do not pull up RXD0, RXD1, TXD0, TXD1, CTS0, RTS0 */
@@ -130,7 +131,7 @@ int board_init ()
 
 #ifdef CONFIG_DRIVER_S3C24X0_I2C
        /* Configure I/O ports PG5 und PG6 for I2C */
-       gpio->PGCON = (gpio->PGCON & 0x003c00) | 0x003c00;
+       gpio->PGCON = (gpio->PGCON & 0x003c00) | 0x003c00;
 #endif /* CONFIG_DRIVER_S3C24X0_I2C */
 
        return 0;
@@ -152,19 +153,34 @@ int dram_init (void)
 
 #define KBD_DATA       (((*(volatile ulong *)0x04020000) >> 16) & 0xF)
 
-static uchar *key_match (ulong);
+static char *key_match (ulong);
 
 int misc_init_r (void)
 {
        ulong kbd_data = KBD_DATA;
-       uchar keybd_env[KEYBD_KEY_NUM + 1];
-       uchar *str;
+       char *str;
+       char keybd_env[KEYBD_KEY_NUM + 1];
        int i;
 
+#ifdef CONFIG_VERSION_VARIABLE
+       {
+               /* Set version variable. Please note, that this variable is
+                * also set in main_loop() later in the boot process. The
+                * version variable has to be set this early, because so it
+                * could be used in script files on an usb stick, which
+                * might be called during do_auto_update() */
+               extern char version_string[];
+
+               setenv ("ver", version_string);
+       }
+#endif /* CONFIG_VERSION_VARIABLE */
+
 #ifdef CONFIG_AUTO_UPDATE
-       extern int do_auto_update(void);
-       /* this has priority over all else */
-       do_auto_update();
+       {
+               extern int do_auto_update(void);
+               /* this has priority over all else */
+               do_auto_update();
+       }
 #endif
 
        for (i = 0; i < KEYBD_KEY_NUM; ++i) {
@@ -184,7 +200,7 @@ int misc_init_r (void)
                free (str);
        }
 
-#ifdef CFG_BRIGHTNESS
+#ifdef CONFIG_SYS_BRIGHTNESS
        tsc2000_set_brightness();
 #endif
        return (0);
@@ -195,7 +211,7 @@ int misc_init_r (void)
 static uchar kbd_magic_prefix[] = "key_magic";
 static uchar kbd_command_prefix[] = "key_cmd";
 
-static int compare_magic (ulong kbd_data, uchar *str)
+static int compare_magic (ulong kbd_data, char *str)
 {
        uchar key_mask;
 
@@ -241,12 +257,12 @@ static int compare_magic (ulong kbd_data, uchar *str)
  * Note: the string points to static environment data and must be
  * saved before you call any function that modifies the environment.
  */
-static uchar *key_match (ulong kbd_data)
+static char *key_match (ulong kbd_data)
 {
-       uchar magic[sizeof (kbd_magic_prefix) + 1];
-       uchar cmd_name[sizeof (kbd_command_prefix) + 1];
-       uchar *suffix;
-       uchar *kbd_magic_keys;
+       char magic[sizeof (kbd_magic_prefix) + 1];
+       char cmd_name[sizeof (kbd_command_prefix) + 1];
+       char *suffix;
+       char *kbd_magic_keys;
 
        /*
         * The following string defines the characters that can pe appended
@@ -291,7 +307,7 @@ static uchar *key_match (ulong kbd_data)
 int do_kbd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
        ulong kbd_data = KBD_DATA;
-       uchar keybd_env[KEYBD_KEY_NUM + 1];
+       char keybd_env[KEYBD_KEY_NUM + 1];
        int i;
 
        puts ("Keys:");
@@ -306,9 +322,9 @@ int do_kbd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(
-       kbd,    1,      1,      do_kbd,
-       "kbd     - read keyboard status\n",
-       NULL
+       kbd,    1,      1,      do_kbd,
+       "read keyboard status",
+       ""
 );
 
 #ifdef CONFIG_MODEM_SUPPORT
@@ -318,7 +334,7 @@ static int key_pressed(void)
 }
 #endif /* CONFIG_MODEM_SUPPORT */
 
-#ifdef CFG_BRIGHTNESS
+#ifdef CONFIG_SYS_BRIGHTNESS
 
 static inline void SET_CS_TOUCH(void)
 {
@@ -341,7 +357,7 @@ static void spi_init(void)
        int i;
 
        /* Configure I/O ports. */
-       gpio->PDCON = (gpio->PDCON & 0xF3FFFF) | 0x040000;
+       gpio->PDCON = (gpio->PDCON & 0xF3FFFF) | 0x040000;
        gpio->PGCON = (gpio->PGCON & 0x0F3FFF) | 0x008000;
        gpio->PGCON = (gpio->PGCON & 0x0CFFFF) | 0x020000;
        gpio->PGCON = (gpio->PGCON & 0x03FFFF) | 0x080000;
@@ -391,7 +407,7 @@ static void tsc2000_write(unsigned int page, unsigned int reg,
 
 static void tsc2000_set_brightness(void)
 {
-       uchar tmp[10];
+       char tmp[10];
        int i, br;
 
        spi_init();
@@ -400,8 +416,19 @@ static void tsc2000_set_brightness(void)
        i = getenv_r("brightness", tmp, sizeof(tmp));
        br = (i > 0)
                ? (int) simple_strtoul (tmp, NULL, 10)
-               : CFG_BRIGHTNESS;
+               : CONFIG_SYS_BRIGHTNESS;
 
        tsc2000_write(0, 0xb, br & 0xff);
 }
 #endif
+
+#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