Skip to contentSkip to conversation

ARM: move debug macros to common location

PATCH New Rob Herring 2 participants 4 messages Aug 31, 2012 – Sep 1, 2012

Subsystems (4)
Arm (32-bit) Arm sub-architectures Arm/versatile express platform Arm/calxeda highbank architecture
lore
Share & tools
lore

Rob Herring

author
#0 lore raw

PATCH 1/3 ARM: move debug macros to common location

From: Rob Herring <[email protected]>

Based on suggestion by Russell King, create a common location for debug macros and select the included debug macro file using config option.

Signed-off-by Rob Herring <[email protected]>
---
 arch/arm/Kconfig.debug          |    5 +++
 arch/arm/include/debug/icedcc.S |   90 +++++++++++++++++++++++++++++++++++++++
 arch/arm/kernel/debug.S         |   87 ++-----------------------------------
 arch/arm/kernel/head.S          |    4 +-
 4 files changed, 100 insertions(+), 86 deletions(-)
 create mode 100644 arch/arm/include/debug/icedcc.S
arch/arm/Kconfig.debug +5 -0
index f15f82b..71bbda2 100644
@@ -373,6 +373,11 @@ choice
 
 endchoice
 
+config DEBUG_LL_INCLUDE
+	string
+	default "debug/icedcc.S" if DEBUG_ICEDCC
+	default "mach/debug-macros.S"
+
 config EARLY_PRINTK
 	bool "Early printk"
 	depends on DEBUG_LL
arch/arm/include/debug/icedcc.S new file +90 -0

90 lines not on this page · raw message

arch/arm/kernel/debug.S +3 -84

93 lines not on this page · raw message

arch/arm/kernel/head.S +2 -2
index 3db960e..9874d07 100644
@@ -23,8 +23,8 @@
 #include <asm/thread_info.h>
 #include <asm/pgtable.h>
 
-#ifdef CONFIG_DEBUG_LL
-#include <mach/debug-macro.S>
+#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_SEMIHOSTING)
+#include CONFIG_DEBUG_LL_INCLUDE
 #endif
 
 /*
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 2/3 ARM: highbank: move debug macros to include/debug

From: Rob Herring <[email protected]>

Move highbank debug-macro.S over to common debug macro directory.

Signed-off-by Rob Herring <[email protected]>
---
 arch/arm/Kconfig.debug                             |    1 +
 .../debug-macro.S => include/debug/highbank.S}     |    0
 2 files changed, 1 insertion(+)
 rename arch/arm/{mach-highbank/include/mach/debug-macro.S => include/debug/highbank.S} (100%)
arch/arm/Kconfig.debug +1 -0
index 71bbda2..71214ab 100644
@@ -376,6 +376,7 @@ endchoice
 config DEBUG_LL_INCLUDE
 	string
 	default "debug/icedcc.S" if DEBUG_ICEDCC
+	default "debug/highbank.S" if DEBUG_HIGHBANK_UART
 	default "mach/debug-macros.S"
 
 config EARLY_PRINTK
arch/arm/include/debug/highbank.S renamed from arch/arm/mach-highbank/include/mach/debug-macro.S +0 -0
similarity index 100%
rename from arch/arm/mach-highbank/include/mach/debug-macro.S
rename to arch/arm/include/debug/highbank.S
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 3/3 ARM: vexpress: move debug macros to include/debug

In reply to Rob Herring

From: Rob Herring <[email protected]>

Move vexpress debug-macro.S over to common debug macro directory.

Signed-off-by Rob Herring <[email protected]>
---
 arch/arm/Kconfig.debug                             |    1 +
 .../debug-macro.S => include/debug/vexpress.S}     |    0
 2 files changed, 1 insertion(+)
 rename arch/arm/{mach-vexpress/include/mach/debug-macro.S => include/debug/vexpress.S} (100%)
arch/arm/Kconfig.debug +1 -0
index 71214ab..2256944 100644
@@ -377,6 +377,7 @@ config DEBUG_LL_INCLUDE
 	string
 	default "debug/icedcc.S" if DEBUG_ICEDCC
 	default "debug/highbank.S" if DEBUG_HIGHBANK_UART
+	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
 	default "mach/debug-macros.S"
 
 config EARLY_PRINTK
arch/arm/include/debug/vexpress.S renamed from arch/arm/mach-vexpress/include/mach/debug-macro.S +0 -0
similarity index 100%
rename from arch/arm/mach-vexpress/include/mach/debug-macro.S
rename to arch/arm/include/debug/vexpress.S
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 1/3 ARM: move debug macros to common location

In reply to Rob Herring
Quoted 5 lines · Rob Herring

From: Rob Herring <[email protected]>

Based on suggestion by Russell King, create a common location for debug macros and select the included debug macro file using config option.

Quoted 8 lines
Signed-off-by Rob Herring <[email protected]>
---
 arch/arm/Kconfig.debug          |    5 +++
 arch/arm/include/debug/icedcc.S |   90 +++++++++++++++++++++++++++++++++++++++
 arch/arm/kernel/debug.S         |   87 ++-----------------------------------
 arch/arm/kernel/head.S          |    4 +-
 4 files changed, 100 insertions(+), 86 deletions(-)
 create mode 100644 arch/arm/include/debug/icedcc.S

I haven't followed that discussion, but it sure sounds like a good idea.

Acked-by Arnd Bergmann <[email protected]>

Any preference which tree to use for merging this?