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

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

diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index f8790427b1a04f11e8a44df216835cb66ff6adc8..9c2a3bbb91552fe765a47a7a849d23945b8e9067 100644 (file)
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -46,7 +46,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600 , 19200 , 38400 , 57600, 115200 }
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
@@ -87,7 +86,6 @@
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#define CONFIG_NET_MULTI       1
 #define CONFIG_MII             1
 #define CONFIG_MII_INIT                1
 #define CONFIG_SYS_DISCOVER_PHY
@@ -174,8 +172,7 @@
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       0x20000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x10000 /* Size of used area in internal SRAM */
-#define CONFIG_SYS_GBL_DATA_SIZE       1000    /* 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
 
 /*-----------------------------------------------------------------------