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

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

diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 002435ec11e32d4961aa41e7a02c605dfdce8c62..764f71be3eb11c6563daee5cf8308e5c2d138f9f 100644 (file)
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -86,7 +86,11 @@
 # error "* External frequency (SysClk) not defined! *"
 #endif
 
-#define CONFIG_UART1_CONSOLE   1       /* Use second UART              */
+#define CONFIG_CONS_INDEX      2       /* Use UART1                    */
+#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550_REG_SIZE    1
+#define CONFIG_SYS_NS16550_CLK         get_serial_clock()
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
@@ -527,13 +531,13 @@
  * GPIO0[30]   - EMAC0 input
  * GPIO0[31]   - EMAC1 reject packet as output
  */
-#define CONFIG_SYS_GPIO0_OSRH          0x40000550
-#define CONFIG_SYS_GPIO0_OSRL          0x00000110
-#define CONFIG_SYS_GPIO0_ISR1H         0x00000000
-/*#define CONFIG_SYS_GPIO0_ISR1L       0x15555445*/
-#define CONFIG_SYS_GPIO0_ISR1L         0x15555444
-#define CONFIG_SYS_GPIO0_TSRH          0x00000000
+#define CONFIG_SYS_GPIO0_OSRL          0x40000550
+#define CONFIG_SYS_GPIO0_OSRH          0x00000110
+#define CONFIG_SYS_GPIO0_ISR1L         0x00000000
+/*#define CONFIG_SYS_GPIO0_ISR1H       0x15555445*/
+#define CONFIG_SYS_GPIO0_ISR1H         0x15555444
 #define CONFIG_SYS_GPIO0_TSRL          0x00000000
+#define CONFIG_SYS_GPIO0_TSRH          0x00000000
 #define CONFIG_SYS_GPIO0_TCR           0xF7FF8014
 
 /*