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

[u-boot] / include / configs / linkstation.h

diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index 7a2a8c33e148fe1e94af3137578ec800bf8c7afa..bb9603418bc8ab35f1c3d4216b278bbb995b4df7 100644 (file)
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -211,7 +211,6 @@
 /*-----------------------------------------------------------------------
  * Ethernet stuff
  */
-#define CONFIG_NET_MULTI
 
 #if defined(CONFIG_LAN) || defined(CONFIG_HLAN)
 #define CONFIG_TULIP
@@ -276,15 +275,13 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #endif
 #define CONFIG_SYS_INIT_RAM_SIZE       0x1000
-#define CONFIG_SYS_GBL_DATA_SIZE       128
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /*----------------------------------------------------------------------
  * Serial configuration
  */
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE                57600
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL