diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 22:25:45 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 22:25:45 +0100 |
commit | 0203e0f7d73fad87921edc42634f73de6fc630c9 (patch) | |
tree | 34b7ef1907a5cde4f0527cb05e3e56c459d02d45 /arch/arm/include | |
parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
parent | a2823dd5f5e2f9da2eafc402612ae85526ed222c (diff) | |
download | op-kernel-dev-0203e0f7d73fad87921edc42634f73de6fc630c9.zip op-kernel-dev-0203e0f7d73fad87921edc42634f73de6fc630c9.tar.gz |
Merge tag 'nomadik-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/multiplatform
From Linus Walleij <linus.walleij@linaro.org>:
Multiplatform support for the Nomadik
- Get rid of the last header files in the <mach/*> namespace
- Move the debug macro to the common place
- Make the necessary Kconfig fixes and move the platform Kconfig
fragment down to the mach directory.
- Include necessary defconfig update to get the platform going.
* tag 'nomadik-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: nomadik: delete remnant include files
ARM: nomadik: convert to multiplatform
ARM: nomadik: move debugmacro to debug includes
ARM: nomadik: delete IRQ header
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/debug/nomadik.S | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/include/debug/nomadik.S b/arch/arm/include/debug/nomadik.S new file mode 100644 index 0000000..7354179 --- /dev/null +++ b/arch/arm/include/debug/nomadik.S @@ -0,0 +1,20 @@ +/* + * 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. + * +*/ + + .macro addruart, rp, rv, tmp + mov \rp, #0x00100000 + add \rp, \rp, #0x000fb000 + add \rv, \rp, #0xf0000000 @ virtual base + add \rp, \rp, #0x10000000 @ physical base address + .endm + +#include <asm/hardware/debug-pl01x.S> |