Merge branch 'next' of /home/wd/git/u-boot/next

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

diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index 7f2542c1f3369e91e809572dc30ddf666e52393d..2e63306d9780894cd0bf2e77107c6d28426183e4 100644 (file)
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -143,8 +143,7 @@
 #define CONFIG_SYS_GBL_DATA_SIZE     128            /* num bytes initial data  */
 
 #define CONFIG_SYS_GBL_DATA_OFFSET   (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
-#define CONFIG_SYS_POST_WORD_ADDR    (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)
-#define CONFIG_SYS_INIT_SP_OFFSET    CONFIG_SYS_POST_WORD_ADDR
+#define CONFIG_SYS_INIT_SP_OFFSET    (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)
 
 #define CONFIG_SYS_MONITOR_LEN       (256 * 1024)   /* Rsrv 256kB for Mon      */
 #define CONFIG_SYS_MALLOC_LEN        (128 * 1024)   /* Rsrv 128kB for malloc   */
@@ -157,7 +156,6 @@
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         get_serial_clock()
-#undef CONFIG_SERIAL_SOFTWARE_FIFO
 #define CONFIG_SERIAL_MULTI   1
 #define CONFIG_BAUDRATE              9600