diff options
| author |   Stephen Warren <swarren@wwwdotorg.org> | 2013-03-11 22:40:18 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@wwwdotorg.org> | 2013-03-12 22:30:45 -0600 |
| commit | f1ac922dec7ed36659344eadc65b9c06efe14d7f (patch) | |
| tree | 15147f471ab89762b3f543282d155189238b0632 /arch/arm/include/debug | |
| parent | Linux 3.9-rc2 (diff) | |
| download | linux-dev-f1ac922dec7ed36659344eadc65b9c06efe14d7f.tar.xz linux-dev-f1ac922dec7ed36659344eadc65b9c06efe14d7f.zip | |
ARM: bcm2835: convert to multi-platform
This allows BCM2835 be included in a kernel build that supports multiple
SoCs at once, which is useful for distro kernels.
This change:
* Moves bcm2835's debug-macro.S into ARM's include/debug/, and hooks it
into the relevant menu.
* Moves bcm2835's Kconfig into its own directory, as seems typical for
multi-platform conversions.
* Removes bcm2835_soc.h, and moves the content to the files where it was
used; just one usage per define.
* Deletes some headers and Makefile.boot that aren't needed now that we
support multi-platform.
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include/debug')
| -rw-r--r-- | arch/arm/include/debug/bcm2835.S | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/include/debug/bcm2835.S b/arch/arm/include/debug/bcm2835.S new file mode 100644 index 000000000000..aed9199bd847 --- /dev/null +++ b/arch/arm/include/debug/bcm2835.S @@ -0,0 +1,22 @@ +/* + * Debugging macro include header + * + * Copyright (C) 2010 Broadcom + * 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. + * + */ + +#define BCM2835_DEBUG_PHYS 0x20201000 +#define BCM2835_DEBUG_VIRT 0xf0201000 + + .macro addruart, rp, rv, tmp + ldr \rp, =BCM2835_DEBUG_PHYS + ldr \rv, =BCM2835_DEBUG_VIRT + .endm + +#include <asm/hardware/debug-pl01x.S> |