leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: vt8500: Convert debug-macro.S to be multiplatform friendly

Browse Source 
This patch moves debug-macro.S from arm/mach-vt8500/include/mach to
arm/include/debug/vt8500.S to provide multiplatform support.

Minor style changes in code for readability.

Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
This commit is contained in:
Tony Prisk 2012-12-28 12:09:18 +13:00
parent 859601e045
commit b61a272275
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/Kconfig.debug
View File

@ -412,6 +412,13 @@ choice
of the tiles using the RS1 memory map, including all new A-class of the tiles using the RS1 memory map, including all new A-class
core tiles, FPGA-based SMMs and software models. core tiles, FPGA-based SMMs and software models.
config DEBUG_VT8500_UART0
bool "Use UART0 on VIA/Wondermedia SoCs"
depends on ARCH_VT8500
help
This option selects UART0 on VIA/Wondermedia System-on-a-chip
devices, including VT8500, WM8505, WM8650 and WM8850.
config DEBUG_LL_UART_NONE config DEBUG_LL_UART_NONE
bool "No low-level debugging UART" bool "No low-level debugging UART"
depends on !ARCH_MULTIPLATFORM depends on !ARCH_MULTIPLATFORM
@ -506,6 +513,7 @@ config DEBUG_LL_INCLUDE
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 || \
DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
default "debug/vt8500.S" if DEBUG_VT8500_UART0
default "debug/tegra.S" if DEBUG_TEGRA_UART default "debug/tegra.S" if DEBUG_TEGRA_UART
default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1 default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
default "mach/debug-macro.S" default "mach/debug-macro.S"

24
arch/arm/mach-vt8500/include/mach/debug-macro.S → arch/arm/include/debug/vt8500.S
View File

@ -1,20 +1,24 @@
/* /*
* arch/arm/mach-vt8500/include/mach/debug-macro.S * Debugging macro include header
* *
* Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
* * Moved from arch/arm/mach-vt8500/include/mach/debug-macro.S
* Debugging macro include header * Minor changes for readability.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
* */
*/
#define DEBUG_LL_PHYS_BASE 0xD8000000
#define DEBUG_LL_VIRT_BASE 0xF8000000
#define DEBUG_LL_UART_OFFSET 0x00200000
#if defined(CONFIG_DEBUG_VT8500_UART0)
.macro addruart, rp, rv, tmp .macro addruart, rp, rv, tmp
mov \rp, #0x00200000 mov \rp, #DEBUG_LL_UART_OFFSET
orr \rv, \rp, #0xf8000000 orr \rv, \rp, #DEBUG_LL_VIRT_BASE
orr \rp, \rp, #0xd8000000 orr \rp, \rp, #DEBUG_LL_PHYS_BASE
.endm .endm
.macro senduart,rd,rx .macro senduart,rd,rx
@ -29,3 +33,5 @@
.macro waituart,rd,rx .macro waituart,rd,rx
.endm .endm
#endif