Skip to contentSkip to conversation

Add an option to disable debug UART.

PATCH In review Vivien Chappelier 2 participants 4 messages Jun 9, 2007 – Jun 12, 2007

Subsystems (2)
Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Vivien Chappelier

author
#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 +0 -0
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
#1 lore raw
Quoted 29 lines · Vivien Chappelier

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 +0 -0
index ca4f577..4051420 100644
@@ -38,6 +38,13 @@
 #endif

include/asm-arm/arch-omap/debug-macro.S line 48

Quoted 10 lines
include/asm-arm/arch-omap/debug-macro.S +6 -0
        .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

Hmm, is the extra + before busyuart above intentional?

Tony

#2 lore raw

t* Tony Lindgren <[email protected]> [070612 06:22]:

Quoted 34 lines · Vivien Chappelier
Quoted 33 lines

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 +3 -0
index ca4f577..4051420 100644
@@ -38,6 +38,13 @@
 #endif
        .endm
+#ifdef CONFIG_OMAP_LL_DEBUG_NONE
+        .macro    senduart,rd,rx
+        .endm
Quoted 8 lines

include/asm-arm/arch-omap/debug-macro.S line 48

Quoted 6 lines
include/asm-arm/arch-omap/debug-macro.S +3 -0
+    +        .macro    busyuart,rd,rx
+        .endm
+#else
        .macro    senduart,rd,rx
        strb    \rd, [\rx]
        .endm

Hmm, is the extra + before busyuart above intentional?

I guess I should be looking at the updated patch set instead...

Tony

author
#3 lore raw

Hi,

Quoted 5 lines · Tony Lindgren
Quoted 2 lines

Hmm, is the extra + before busyuart above intentional?

I guess I should be looking at the updated patch set instead...

Yes, sorry for the mess...
Most of the syntactic mistakes still apply though, so I'll update my patches to take them into account.

I've just noticed I've forgotten to use 'struct kp_key' for a few boards in '[PATCH 11/12] Add support for keys setting multiple bits in the scan', so I'll fix that as well.

Concerning patches which add new config options such as in
'[PATCH 3/12] Add an option to disable debug UART.', should I also provide a patch to update all defconfigs or is it ok not to do so?

Thanks for your time,
Vivien.