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

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

diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h
index 4a407b1c7be3c8630fd3e81798738546f5760772..1391ce517dc1a37e332b47e4c1e48aaf37939650 100644 (file)
--- a/include/configs/MOUSSE.h
+++ b/include/configs/MOUSSE.h
@@ -50,6 +50,7 @@
 #define CONFIG_MOUSSE       1
 
 #define        CONFIG_SYS_TEXT_BASE    0xFFF00000
+#define        CONFIG_SYS_LDSCRIPT     "board/mousse/u-boot.lds"
 
 #define CONFIG_SYS_ADDR_MAP_B      1
 
@@ -139,8 +140,6 @@
                                           1MB - 64K FLASH0 SEG =960K
                                           (size=0xf0000)*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE  { 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * NS16550 Configuration
  */
@@ -158,8 +157,7 @@
  */
 #define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_MONITOR_LEN
 #define CONFIG_SYS_INIT_RAM_SIZE   0x2F00  /* Size of used area in DPRAM  */
-#define CONFIG_SYS_GBL_DATA_SIZE  64  /* size in bytes reserved for initial data */
-#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)
 #define CONFIG_SYS_INIT_SP_OFFSET  CONFIG_SYS_GBL_DATA_OFFSET
 
 /*
@@ -334,7 +332,6 @@
 #define CONFIG_PCI                     /* include pci support                  */
 #undef CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI               /* Multi ethernet cards support         */
 
 #define CONFIG_TULIP