Merge branch 'fixes'

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

diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index 63d07ffd2eb0fe26e30e6e219c62e39d34e9d55a..c802dcb6a2ae21bc4415d6f01a3bd2ebe0d18cb3 100644 (file)
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -37,17 +37,20 @@
 #define        CONFIG_SERIAL_BASE      XILINX_UARTLITE_BASEADDR
 #define        CONFIG_BAUDRATE         XILINX_UARTLITE_BAUDRATE
 #define        CONFIG_SYS_BAUDRATE_TABLE       { CONFIG_BAUDRATE }
-#else
-#ifdef XILINX_UART16550_BASEADDR
-#define CONFIG_SYS_NS16550
+#elif XILINX_UART16550_BASEADDR
+#define CONFIG_SYS_NS16550     1
 #define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    4
+#define CONFIG_SYS_NS16550_REG_SIZE    -4
 #define CONFIG_CONS_INDEX      1
-#define CONFIG_SYS_NS16550_COM1        XILINX_UART16550_BASEADDR
+#define CONFIG_SYS_NS16550_COM1        (XILINX_UART16550_BASEADDR + 0x1000 + 0x3)
 #define CONFIG_SYS_NS16550_CLK         XILINX_UART16550_CLOCK_HZ
 #define        CONFIG_BAUDRATE         115200
-#define        CONFIG_SYS_BAUDRATE_TABLE       { 9600, 115200 }
-#endif
+
+/* The following table includes the supported baudrates */
+#define CONFIG_SYS_BAUDRATE_TABLE  \
+       {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
+#else
+#error Undefined uart
 #endif
 
 /* setting reset address */
@@ -274,6 +277,5 @@
                                        "1m(romfs),1m(cramfs),-(jffs2)\0"
 
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_OF_LIBFDT       1
 
 #endif /* __CONFIG_H */