Add debug console on COM12 for MCC200 board

diff --git a/CHANGELOG b/CHANGELOG
index 24499c5621a3c7c11680a82fe9843ce212299eed..727d7ec7aed08e4c41e3a0179dc729e08b57d833 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Add debug console on COM12 for MCC200 board
+
 * Fix control-c handing in CONFIG_CMDLINE_EDITING
   Properly pass break code back from readline.
   Patch by Roger Blofeld, 31 Jul 2006

diff --git a/Makefile b/Makefile
index 128ae59a066b7526c4e7823cfc09598c3c2c1fbd..4d579d9bd350dbcd1c5b41f0287381a6928335cf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -325,6 +325,7 @@ lite5200b_LOWBOOT_config:   unconfig
 mcc200_config  \
 mcc200_SDRAM   \
 mcc200_highboot        \
+mcc200_COM12   \
 mcc200_highboot_SDRAM: unconfig
        @ >include/config.h
        @[ -n "$(findstring highboot,$@)" ] || \
@@ -341,6 +342,10 @@ mcc200_highboot_SDRAM:     unconfig
                { echo "#define CONFIG_MCC200_SDRAM"    >>include/config.h ; \
                  echo "... with SDRAM" ; \
                }
+       @[ -z "$(findstring COM12,$@)" ] || \
+               { echo "#define CONFIG_CONSOLE_COM12"   >>include/config.h ; \
+                 echo "... with console on COM12" ; \
+               }
        @./mkconfig -a mcc200 ppc mpc5xxx mcc200
 
 o2dnt_config:

diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index ce33b85c96d28fa80fb6c31c2fe93fea5811d094..563f7978d5f3f287deddab43c56fce6abb854267 100644 (file)
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -51,15 +51,20 @@
  *  To select console on the one of 8 external UARTs,
  * define CONFIG_QUART_CONSOLE as 1, 2, 3, or 4 for the first Quad UART,
  * or as 5, 6, 7, or 8 for the second Quad UART.
+ * COM11, COM12, COM13, COM14 are located on the second Quad UART.
  *
  *  CONFIG_PSC_CONSOLE must be undefined in this case.
  */
-/* #define CONFIG_QUART_CONSOLE        1       */ /* console is on UART1 of QUART1     */
+#ifdef CONFIG_CONSOLE_COM12
+#define CONFIG_QUART_CONSOLE   6       /* console is on UARTF of QUART2        */
+#else
+#define CONFIG_QUART_CONSOLE   8       /* console is on UARTH of QUART2        */
+#endif
 /*
  *  To select console on PSC1, define CONFIG_PSC_CONSOLE as 1
  * and undefine CONFIG_QUART_CONSOLE.
  */
-#define CONFIG_PSC_CONSOLE     1       /* console is on PSC1                   */
+/*#define CONFIG_PSC_CONSOLE   1       */ /* console is on PSC1                */
 #if defined(CONFIG_QUART_CONSOLE) && defined(CONFIG_PSC_CONSOLE)
 #error "Select only one console device!"
 #endif