From 698328ff8c7f4f02ab9425e3a237cc607420a4dd Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 6 Sep 2012 14:14:46 -0500 Subject: [PATCH] --- yaml --- r: 327104 b: refs/heads/master c: 59bba2a9854a2de869440ff799d8e3dfd4779543 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig.debug | 8 ++++++++ .../mach/debug-macro.S => include/debug/picoxcell.S} | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) rename trunk/arch/arm/{mach-picoxcell/include/mach/debug-macro.S => include/debug/picoxcell.S} (89%) diff --git a/[refs] b/[refs] index ede9250b97ed..e779a97a2c6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6111bf7c578dafc08785c02678bfa1ec9b6f4a73 +refs/heads/master: 59bba2a9854a2de869440ff799d8e3dfd4779543 diff --git a/trunk/arch/arm/Kconfig.debug b/trunk/arch/arm/Kconfig.debug index aa56934cd284..b74ed971868d 100644 --- a/trunk/arch/arm/Kconfig.debug +++ b/trunk/arch/arm/Kconfig.debug @@ -268,6 +268,13 @@ choice Say Y here if you want kernel low-level debugging support on MVEBU based platforms. + config DEBUG_PICOXCELL_UART + depends on ARCH_PICOXCELL + bool "Use PicoXcell UART for low-level debug" + help + Say Y here if you want kernel low-level debugging support + on PicoXcell based platforms. + config DEBUG_REALVIEW_STD_PORT bool "RealView Default UART" depends on ARCH_REALVIEW @@ -392,6 +399,7 @@ config DEBUG_LL_INCLUDE default "debug/icedcc.S" if DEBUG_ICEDCC default "debug/highbank.S" if DEBUG_HIGHBANK_UART default "debug/mvebu.S" if DEBUG_MVEBU_UART + default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART default "debug/socfpga.S" if DEBUG_SOCFPGA_UART default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 diff --git a/trunk/arch/arm/mach-picoxcell/include/mach/debug-macro.S b/trunk/arch/arm/include/debug/picoxcell.S similarity index 89% rename from trunk/arch/arm/mach-picoxcell/include/mach/debug-macro.S rename to trunk/arch/arm/include/debug/picoxcell.S index 58d4ee3ae949..7419deb1b948 100644 --- a/trunk/arch/arm/mach-picoxcell/include/mach/debug-macro.S +++ b/trunk/arch/arm/include/debug/picoxcell.S @@ -9,10 +9,10 @@ * accesses to the 8250. */ #include -#include -#include #define UART_SHIFT 2 +#define PICOXCELL_UART1_BASE 0x80230000 +#define PHYS_TO_IO(x) (((x) & 0x00ffffff) | 0xfe000000) .macro addruart, rp, rv, tmp ldr \rv, =PHYS_TO_IO(PICOXCELL_UART1_BASE)