Add an option to disable debug UART.

PATCH In review Vivien Chappelier 1 participant 1 message Jun 9, 2007

Subsystems (2)

Arm (32-bit) Arm sub-architectures

lore

Share & tools

lore

Vivien Chappelier

author

2007-06-09 18:39 UTC #0 lore raw

PATCH 3/12 Add an option to disable debug UART.

This patch adds an option to boot without any debug UART.

Signed-off-by Vivien Chappelier <[email protected]>

---
 arch/arm/plat-omap/Kconfig              |    3 +++
 include/asm-arm/arch-omap/debug-macro.S |   10 +++++++++-
 include/asm-arm/arch-omap/uncompress.h  |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

arch/arm/plat-omap/Kconfig +3 -0

index 6facd96..a02e954 100644
@@ -178,6 +178,9 @@ choice
 	depends on ARCH_OMAP
 	default OMAP_LL_DEBUG_UART1
 
+config OMAP_LL_DEBUG_NONE
+	bool "NONE"
+
 config OMAP_LL_DEBUG_UART1
 	bool "UART1"

include/asm-arm/arch-omap/debug-macro.S +9 -1

index ca4f577..4051420 100644
@@ -38,6 +38,13 @@
 #endif
 		.endm
 
+#ifdef CONFIG_OMAP_LL_DEBUG_NONE
+		.macro	senduart,rd,rx
+		.endm
+	
+		.macro	busyuart,rd,rx
+		.endm
+#else
 		.macro	senduart,rd,rx
 		strb	\rd, [\rx]
 		.endm

@@ -53,6 +60,7 @@
 		bne	1001b
 1002:
 		.endm
-
+#endif
+	
 		.macro	waituart,rd,rx
 		.endm

include/asm-arm/arch-omap/uncompress.h +1 -1

index aca0adf..409af7e 100644
@@ -34,7 +34,7 @@ static void putc(int c)
 	volatile u8 * uart = 0;
 	int shift = 2;
 
-#ifdef CONFIG_MACH_OMAP_PALMTE
+#if defined(CONFIG_MACH_OMAP_PALMTE) || defined(CONFIG_MACH_TYPHOON)
 	return;
 #endif

Signature · 1 line

1.5.1.3