SMDK2410: remove unneeded config.mk

[karo-tx-uboot.git] / include / configs / netstal-common.h

diff --git a/include/configs/netstal-common.h b/include/configs/netstal-common.h
index 1fa4b00eb5b88d86b301da703e4b2ba4b1b0f19b..122f139f15ec0235a038c2bf9ef3a4b006fc1288 100644 (file)
--- a/include/configs/netstal-common.h
+++ b/include/configs/netstal-common.h
@@ -27,14 +27,19 @@
 #define __NETSTAL_COMMON_H
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* Start of U-Boot      */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* Start of U-Boot      */
 #define CONFIG_SYS_MONITOR_LEN         (320 * 1024)    /* Reserve 320 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)    /* Reserve 256 kB for malloc() */
 
 /*
  * UART
  */
+#define CONFIG_CONS_INDEX      1       /* Use UART0                    */
 #define CONFIG_SERIAL_MULTI
+#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550_REG_SIZE    1
+#define CONFIG_SYS_NS16550_CLK         get_serial_clock()
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
@@ -42,6 +47,7 @@
  * I2C
  */
 #define CONFIG_HARD_I2C                1       /* I2C with hardware support */
+#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address  */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 
@@ -58,10 +64,11 @@
 /*
  * Ethernet/EMAC/PHY
  */
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII                     /* MII PHY management           */
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
-#if defined(CONFIG_440)
 #define CONFIG_NET_MULTI       1
+#if defined(CONFIG_440)
 #define CONFIG_NETCONSOLE              /* include NetConsole support   */
 #define CONFIG_SYS_RX_ETH_BUFFER       32      /* number of eth rx buffers     */
 #else
@@ -201,8 +208,9 @@
 #define CONFIG_ETHADDR      00:60:13:00:00:00   /* Netstal Machines AG MAC */
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
 
-#define CONFIG_SYS_TFTP_LOADADDR 0x01000000
-
+#define CONFIG_SYS_TFTP_LOADADDR       0x01000000
+#define CONFIG_SYS_VXWORKS_ADD_PARAMS  "u=dpu pw=netstal8752"
+#define CONFIG_SYS_VXWORKS_SERVERNAME  "c"
 /*
  * General common environment variables shared by all boards produced by Netstal Maschinen
  */
@@ -222,19 +230,17 @@
        "fdt_addr_r=800000\0"                                           \
        "hostname=" xstr(CONFIG_HOSTNAME) "\0"                          \
        "bootfile=" xstr(CONFIG_HOSTNAME) "/uImage\0"                   \
-       "load=tftp 200000 " xstr(CONFIG_HOSTNAME) "/u-boot.bin\0"       \
-       "update=protect off " xstr(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;"        \
-               "era " xstr(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;"               \
-               "cp.b ${fileaddr} " xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize};" \
-               "setenv filesize\0"                                     \
-       "upd=run load update\0"                                         \
-       "vx_rom=" xstr(CONFIG_HOSTNAME) "/"                             \
-       xstr(CONFIG_HOSTNAME) "_vx_rom\0"                               \
-       "vx=tftp " xstr(CONFIG_SYS_TFTP_LOADADDR) " ${vx_rom};run vxargs;"      \
-       "bootvx\0"                                                      \
-       "vxargs=setenv bootargs emac(0,0)c:${vx_rom} e=${ipaddr}"       \
-       " h=${serverip} u=dpu pw=netstal8752 "                          \
-       "tn=" xstr(CONFIG_HOSTNAME) " f=0x3008\0"                       \
+       "uload=tftp " xstr(CONFIG_SYS_TFTP_LOADADDR) " "                \
+               xstr(CONFIG_HOSTNAME) "/u-boot.bin\0"                   \
+       "vx_rom=" xstr(CONFIG_HOSTNAME) "/"                             \
+               xstr(CONFIG_HOSTNAME) "_vx_rom\0"                       \
+       "update=protect off " xstr(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;"\
+               "era " xstr(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;"       \
+               "cp.b ${fileaddr} "xstr(CONFIG_SYS_MONITOR_BASE)        \
+               " ${filesize}; setenv filesize\0"                       \
+       "upd=run uload update\0"                                        \
+       "vx=setenv bootfile ${vx_rom}; tftp "                           \
+               xstr(CONFIG_SYS_TFTP_LOADADDR) "; bootvx\0"             \
        CONFIG_NETSTAL_DEF_ENV_ROOTPATH
 
 /*