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

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

diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h
index 3aed447e17aa10c13527efddd5d073cae5fd73a9..52d172925b5fc88134d561b66b9c2ea48142a080 100644 (file)
--- a/include/configs/MVBLUE.h
+++ b/include/configs/MVBLUE.h
@@ -44,6 +44,7 @@
 #define MVBLUE_BOARD_LYNX      2
 
 #define        CONFIG_SYS_TEXT_BASE    0xFFF00000
+#define CONFIG_SYS_LDSCRIPT    "board/mvblue/u-boot.lds"
 
 #if 0
 #define ERR_LED(code)  do { if (code) \
@@ -65,7 +66,6 @@
 
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOT_RETRY_TIME -1
@@ -157,7 +157,6 @@
 #define CONFIG_PCI_PNP
 #define CONFIG_PCI_SCAN_SHOW
 
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT         5
 
 #define CONFIG_TULIP