summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2013-03-11 22:40:18 -0600
committerStephen Warren <swarren@wwwdotorg.org>2013-03-12 22:30:45 -0600
commitf1ac922dec7ed36659344eadc65b9c06efe14d7f (patch)
tree15147f471ab89762b3f543282d155189238b0632 /arch/arm/configs
parentf6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff)
downloadtalos-obmc-linux-f1ac922dec7ed36659344eadc65b9c06efe14d7f.tar.gz
talos-obmc-linux-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/configs')
-rw-r--r--arch/arm/configs/bcm2835_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig
index af472e4ed451..3a1c939735e0 100644
--- a/arch/arm/configs/bcm2835_defconfig
+++ b/arch/arm/configs/bcm2835_defconfig
@@ -29,6 +29,8 @@ CONFIG_EMBEDDED=y
CONFIG_PROFILING=y
CONFIG_OPROFILE=y
CONFIG_JUMP_LABEL=y
+CONFIG_ARCH_MULTI_V6=y
+# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_BCM2835=y
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_AEABI=y
OpenPOWER on IntegriCloud