diff mbox

[06/12] ARM: picoxcell: move debug macros to include/debug

Message ID 1346962375-26163-7-git-send-email-robherring2@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Rob Herring Sept. 6, 2012, 8:12 p.m. UTC 
From: Rob Herring <rob.herring@calxeda.com>

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

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Jamie Iles <jamie@jamieiles.com>
---
 arch/arm/Kconfig.debug                             |    8 ++++++++
 .../debug-macro.S => include/debug/picoxcell.S}    |    0
 2 files changed, 8 insertions(+)
 rename arch/arm/{mach-picoxcell/include/mach/debug-macro.S => include/debug/picoxcell.S} (100%)

diff --git a/arch/arm/mach-picoxcell/include/mach/debug-macro.S b/arch/arm/include/debug/picoxcell.S
similarity index 100%
rename from arch/arm/mach-picoxcell/include/mach/debug-macro.S
rename to arch/arm/include/debug/picoxcell.S

Comments

Shawn Guo Sept. 13, 2012, 2:16 p.m. UTC | #1 
On Thu, Sep 06, 2012 at 03:12:49PM -0500, Rob Herring wrote:
> From: Rob Herring <rob.herring@calxeda.com>
> 
> Move picoxcell debug-macro.S over to common debug macro directory.
> 
> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
> Cc: Jamie Iles <jamie@jamieiles.com>
> ---
>  arch/arm/Kconfig.debug                             |    8 ++++++++
>  .../debug-macro.S => include/debug/picoxcell.S}    |    0
>  2 files changed, 8 insertions(+)
>  rename arch/arm/{mach-picoxcell/include/mach/debug-macro.S => include/debug/picoxcell.S} (100%)
> 
Can we do that renaming right away?  I still see the following
inclusions in the file.

#include <mach/hardware.h>
#include <mach/map.h>
Rob Herring Sept. 13, 2012, 3:14 p.m. UTC | #2 
On 09/13/2012 09:16 AM, Shawn Guo wrote:
> On Thu, Sep 06, 2012 at 03:12:49PM -0500, Rob Herring wrote:
>> From: Rob Herring <rob.herring@calxeda.com>
>>
>> Move picoxcell debug-macro.S over to common debug macro directory.
>>
>> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
>> Cc: Jamie Iles <jamie@jamieiles.com>
>> ---
>>  arch/arm/Kconfig.debug                             |    8 ++++++++
>>  .../debug-macro.S => include/debug/picoxcell.S}    |    0
>>  2 files changed, 8 insertions(+)
>>  rename arch/arm/{mach-picoxcell/include/mach/debug-macro.S => include/debug/picoxcell.S} (100%)
>>
> Can we do that renaming right away?  I still see the following
> inclusions in the file.
> 
> #include <mach/hardware.h>
> #include <mach/map.h>

Right, I've incorporated the fix Jamie posted for this.

Rob
diff mbox

Patch

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index aa56934..b74ed97 100644
--- a/arch/arm/Kconfig.debug
+++ b/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