Index: arch/arm/Kconfig.debug
===================================================================
RCS file: /cvsroot/xanadux/linux-2.6-xda/arch/arm/Kconfig.debug,v
retrieving revision 1.1.1.1.2.1
diff -u -3 -b -r1.1.1.1.2.1 Kconfig.debug
--- arch/arm/Kconfig.debug	1 Oct 2005 15:03:25 -0000	1.1.1.1.2.1
+++ arch/arm/Kconfig.debug	26 Nov 2005 01:44:17 -0000
@@ -106,12 +106,31 @@
 	  The uncompressor code port configuration is now handled
 	  by CONFIG_S3C2410_LOWLEVEL_UART_PORT.
 
+choice
+	prompt "Kernel low-level debugging via"
+	depends on DEBUG_LL && ARCH_PXA
+	default DEBUG_PXA_FFUART
+
+config DEBUG_PXA_FFUART
+	bool "Full-Featured UART"
+	depends on DEBUG_LL && ARCH_PXA
+	help
+	  Saying Y will cause the debug messages to appear on the full featured UART.
+
 config DEBUG_PXA_STUART
-	bool "Kernel low-level debugging messages via Standard UART"
+	bool "Standard UART"
 	depends on DEBUG_LL && ARCH_PXA
 	help
 	  Say Y here if you want the debug print routines to direct their
-	  output to the standard serial UART on these devices.  Saying N will
-	  cause the debug messages to appear on the full featured UART.
+	  output to the standard serial UART on these devices.
+
+config DEBUG_PXA_BTUART
+	bool "BT UART"
+	depends on DEBUG_LL && ARCH_PXA
+	help
+	  Say Y here if you want the debug print routines to direct their
+	  output to the BTUART on these devices.
+
+endchoice
 
 endmenu
Index: include/asm-arm/arch-pxa/debug-macro.S
===================================================================
RCS file: /cvsroot/xanadux/linux-2.6-xda/include/asm-arm/arch-pxa/debug-macro.S,v
retrieving revision 1.1.1.1.2.1
diff -u -3 -b -r1.1.1.1.2.1 debug-macro.S
--- include/asm-arm/arch-pxa/debug-macro.S	1 Oct 2005 15:03:27 -0000	1.1.1.1.2.1
+++ include/asm-arm/arch-pxa/debug-macro.S	26 Nov 2005 01:44:17 -0000
@@ -18,6 +18,8 @@
 		movne	\rx, #io_p2v(0x40000000)	@ virtual
 #if defined(CONFIG_DEBUG_PXA_STUART)
 		orr     \rx, \rx, #0x00700000
+#elif defined(CONFIG_DEBUG_PXA_BTUART)
+		orr     \rx, \rx, #0x00200000
 #else
 		orr     \rx, \rx, #0x00100000
 #endif
Index: include/asm-arm/arch-pxa/uncompress.h
===================================================================
RCS file: /cvsroot/xanadux/linux-2.6-xda/include/asm-arm/arch-pxa/uncompress.h,v
retrieving revision 1.1.1.2.2.1
diff -u -3 -b -r1.1.1.2.2.1 uncompress.h
--- include/asm-arm/arch-pxa/uncompress.h	1 Oct 2005 15:03:27 -0000	1.1.1.2.2.1
+++ include/asm-arm/arch-pxa/uncompress.h	26 Nov 2005 01:44:17 -0000
@@ -25,8 +25,10 @@
 #define STUART		((volatile unsigned long *)0x40700000)
 #define HWUART		((volatile unsigned long *)0x41600000)
 
-#ifdef CONFIG_DEBUG_PXA_STUART
+#if defined(CONFIG_DEBUG_PXA_STUART)
 #define UART		STUART
+#elif defined(CONFIG_DEBUG_PXA_BTUART)
+#define UART		BTUART
 #else
 #define UART		FFUART
 #endif