ARM: debug: move StrongARM debug include to arch/arm/include/debug

PATCH Superseded Dmitry Eremin-Solenikov 2 participants 3 messages Oct 16, 2014 – Oct 20, 2014

Subsystems (2)

Arm (32-bit) Arm sub-architectures

lore

Share & tools

lore

Dmitry Eremin-Solenikov

author

2014-10-16 07:31 UTC #0 lore raw

PATCH 1/1 ARM: debug: move StrongARM debug include to arch/arm/include/debug

StrongARM debug-macro.S is quite standalone thing, depending only on register mappings. Move it to proper place and add Kconfig entry.

Signed-off-by Dmitry Eremin-Solenikov <[email protected]>

---
 arch/arm/Kconfig.debug                                         |  9 +++++++++
 .../include/mach/debug-macro.S => include/debug/sa1100.S}      | 10 ++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 rename arch/arm/{mach-sa1100/include/mach/debug-macro.S => include/debug/sa1100.S} (83%)

arch/arm/Kconfig.debug +9 -0

index b11ad54..8adf043 100644
@@ -547,6 +547,14 @@ choice
 		  Say Y here if you want kernel low-level debugging support
 		  on PXA UART1.
 
+	config DEBUG_SA1100
+		depends on ARCH_SA1100
+		bool "Use SA1100 UARTs for low-level debug"
+		help
+		  Say Y here if you want kernel low-level debugging support
+		  on SA-11x0 UART ports. The kernel will check for the first
+		  enabled UART in a sequence 3-1-2.
+
 	config DEBUG_REALVIEW_STD_PORT
 		bool "RealView Default UART"
 		depends on ARCH_REALVIEW

@@ -1009,6 +1017,7 @@ config DEBUG_STI_UART
 
 config DEBUG_LL_INCLUDE
 	string
+	default "debug/sa1100.S" if DEBUG_SA1100
 	default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250
 	default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2
 	default "debug/pl01x.S" if DEBUG_LL_UART_PL01X || DEBUG_UART_PL01X

arch/arm/include/debug/sa1100.S renamed from arch/arm/mach-sa1100/include/mach/debug-macro.S +8 -2

similarity index 83%
rename from arch/arm/mach-sa1100/include/mach/debug-macro.S
rename to arch/arm/include/debug/sa1100.S
index 530772d..a0ae4f4 100644
@@ -1,4 +1,4 @@
-/* arch/arm/mach-sa1100/include/mach/debug-macro.S
+/* arch/arm/include/debug/sa1100.S
  *
  * Debugging macro include header
  *

@@ -10,7 +10,13 @@
  * published by the Free Software Foundation.
  *
 */
-#include <mach/hardware.h>
+
+#define UTCR3		0x0c
+#define UTDR		0x14
+#define UTSR1		0x20
+#define UTCR3_TXE	0x00000002	/* Transmit Enable                 */
+#define UTSR1_TBY	0x00000001	/* Transmitter BusY (read)         */
+#define UTSR1_TNF	0x00000004	/* Transmit FIFO Not Full (read)   */
 
 		.macro	addruart, rp, rv, tmp
 		mrc	p15, 0, \rp, c1, c0

Signature · 1 line

2.1.1

Arnd Bergmann

2014-10-20 19:43 UTC #1 lore raw

PATCH 1/1 ARM: debug: move StrongARM debug include to arch/arm/include/debug

Quoted 4 lines · On Thursday 16 October 2014 11:31:36 Dmitry Eremin-Solenikov wrote:

StrongARM debug-macro.S is quite standalone thing, depending only on register mappings. Move it to proper place and add Kconfig entry.
Signed-off-by Dmitry Eremin-Solenikov <[email protected]>

Looks good to me in principle. Russell, are you ok with us picking this up through arm-soc?

Quoted 14 lines

 arch/arm/Kconfig.debug                                         |  9 +++++++++
 .../include/mach/debug-macro.S => include/debug/sa1100.S}      | 10 ++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 rename arch/arm/{mach-sa1100/include/mach/debug-macro.S => include/debug/sa1100.S} (83%)

arch/arm/Kconfig.debug +1 -0

index b11ad54..8adf043 100644
@@ -547,6 +547,14 @@ choice
                  Say Y here if you want kernel low-level debugging support
                  on PXA UART1.
 
+       config DEBUG_SA1100

arch/arm/Kconfig.debug choice · line 560

Quoted 10 lines

arch/arm/Kconfig.debug +7 -0

+               depends on ARCH_SA1100
+               bool "Use SA1100 UARTs for low-level debug"
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on SA-11x0 UART ports. The kernel will check for the first
+                 enabled UART in a sequence 3-1-2.
+
        config DEBUG_REALVIEW_STD_PORT
                bool "RealView Default UART"
                depends on ARCH_REALVIEW

Note that the symbols are ordered alphabetically. Please fix this.

Arnd