From: Wolfgang Denk <wd@pollux.denx.de>
Date: Wed, 16 Aug 2006 22:36:51 +0000 (+0200)
Subject: Add debug console on COM12 for MCC200 board
X-Git-Tag: U-Boot-1_1_5~60
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=463764c893a657124eb2818e3103a04171bcbda1;p=u-boot

Add debug console on COM12 for MCC200 board
---

diff --git a/CHANGELOG b/CHANGELOG
index 24499c5621..727d7ec7ae 100644
--- 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 128ae59a06..4d579d9bd3 100644
--- 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 ce33b85c96..563f7978d5 100644
--- 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