ARM: pxa: move debug uart code
Move debug uart code from mach-pxa/mach-mmp to debug directory. Since they are similar, merge them together. Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> Acked-by: Eric Mico <eric.y.miao@gmail.com>
This commit is contained in:
parent
8cdde33866
commit
0a43cd3b1c
|
@ -312,6 +312,13 @@ choice
|
||||||
Say Y here if you want kernel low-level debugging support
|
Say Y here if you want kernel low-level debugging support
|
||||||
on PicoXcell based platforms.
|
on PicoXcell based platforms.
|
||||||
|
|
||||||
|
config DEBUG_PXA_UART1
|
||||||
|
depends on ARCH_PXA
|
||||||
|
bool "Use PXA UART1 for low-level debug"
|
||||||
|
help
|
||||||
|
Say Y here if you want kernel low-level debugging support
|
||||||
|
on PXA UART1.
|
||||||
|
|
||||||
config DEBUG_REALVIEW_STD_PORT
|
config DEBUG_REALVIEW_STD_PORT
|
||||||
bool "RealView Default UART"
|
bool "RealView Default UART"
|
||||||
depends on ARCH_REALVIEW
|
depends on ARCH_REALVIEW
|
||||||
|
@ -593,6 +600,8 @@ config DEBUG_LL_INCLUDE
|
||||||
default "debug/mvebu.S" if DEBUG_MVEBU_UART
|
default "debug/mvebu.S" if DEBUG_MVEBU_UART
|
||||||
default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
|
default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
|
||||||
default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
|
default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
|
||||||
|
default "debug/pxa.S" if DEBUG_PXA_UART1 || DEBUG_MMP_UART2 || \
|
||||||
|
DEBUG_MMP_UART3
|
||||||
default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
|
default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
|
||||||
default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
|
default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
|
||||||
default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
|
default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
/*
|
||||||
|
* Early serial output macro for Marvell PXA/MMP SoC
|
||||||
|
*
|
||||||
|
* Copyright (C) 1994-1999 Russell King
|
||||||
|
* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
|
||||||
|
*
|
||||||
|
* Copyright (C) 2013 Haojian Zhuang
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if defined(CONFIG_DEBUG_PXA_UART1)
|
||||||
|
#define PXA_UART_REG_PHYS_BASE 0x40100000
|
||||||
|
#define PXA_UART_REG_VIRT_BASE 0xf2100000
|
||||||
|
#elif defined(CONFIG_DEBUG_MMP_UART2)
|
||||||
|
#define PXA_UART_REG_PHYS_BASE 0xd4017000
|
||||||
|
#define PXA_UART_REG_VIRT_BASE 0xfe017000
|
||||||
|
#elif defined(CONFIG_DEBUG_MMP_UART3)
|
||||||
|
#define PXA_UART_REG_PHYS_BASE 0xd4018000
|
||||||
|
#define PXA_UART_REG_VIRT_BASE 0xfe018000
|
||||||
|
#else
|
||||||
|
#error "Select uart for DEBUG_LL"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
.macro addruart, rp, rv, tmp
|
||||||
|
ldr \rp, =PXA_UART_REG_PHYS_BASE
|
||||||
|
ldr \rv, =PXA_UART_REG_VIRT_BASE
|
||||||
|
.endm
|
||||||
|
|
||||||
|
#define UART_SHIFT 2
|
||||||
|
#include <asm/hardware/debug-8250.S>
|
|
@ -1,30 +0,0 @@
|
||||||
/* arch/arm/mach-mmp/include/mach/debug-macro.S
|
|
||||||
*
|
|
||||||
* Debugging macro include header
|
|
||||||
*
|
|
||||||
* Copied from arch/arm/mach-pxa/include/mach/debug.S
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
|
||||||
* published by the Free Software Foundation.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(CONFIG_DEBUG_MMP_UART2)
|
|
||||||
#define MMP_UART_OFFSET 0x00017000
|
|
||||||
#elif defined(CONFIG_DEBUG_MMP_UART3)
|
|
||||||
#define MMP_UART_OFFSET 0x00018000
|
|
||||||
#else
|
|
||||||
#error "Select uart for DEBUG_LL"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <mach/addr-map.h>
|
|
||||||
|
|
||||||
.macro addruart, rp, rv, tmp
|
|
||||||
ldr \rp, =APB_PHYS_BASE @ physical
|
|
||||||
ldr \rv, =APB_VIRT_BASE @ virtual
|
|
||||||
orr \rp, \rp, #MMP_UART_OFFSET
|
|
||||||
orr \rv, \rv, #MMP_UART_OFFSET
|
|
||||||
.endm
|
|
||||||
|
|
||||||
#define UART_SHIFT 2
|
|
||||||
#include <asm/hardware/debug-8250.S>
|
|
|
@ -1,23 +0,0 @@
|
||||||
/* arch/arm/mach-pxa/include/mach/debug-macro.S
|
|
||||||
*
|
|
||||||
* Debugging macro include header
|
|
||||||
*
|
|
||||||
* Copyright (C) 1994-1999 Russell King
|
|
||||||
* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
|
||||||
* published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "hardware.h"
|
|
||||||
|
|
||||||
.macro addruart, rp, rv, tmp
|
|
||||||
mov \rp, #0x00100000
|
|
||||||
orr \rv, \rp, #io_p2v(0x40000000) @ virtual
|
|
||||||
orr \rp, \rp, #0x40000000 @ physical
|
|
||||||
.endm
|
|
||||||
|
|
||||||
#define UART_SHIFT 2
|
|
||||||
#include <asm/hardware/debug-8250.S>
|
|
Loading…
Reference in New Issue