summaryrefslogtreecommitdiff
path: root/arch/arm/configs/bcm2835_defconfig
diff options
context:
space:
mode:
authorMarkus Mayer <markus.mayer@linaro.org>2014-02-21 04:16:11 +0400
committerStephen Warren <swarren@wwwdotorg.org>2014-02-25 06:42:35 +0400
commitd30fe6272183f3cc8b9f3f111cd36271332e4cec (patch)
treeb687736f4e0c2fc441c40db4dc917c7b1e47730c /arch/arm/configs/bcm2835_defconfig
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
downloadlinux-d30fe6272183f3cc8b9f3f111cd36271332e4cec.tar.xz
ARM: bcm2835: Move to mach-bcm directory
Move the bcm2835 board file into the mach-bcm directory. This allows us to get rid of the mach-bcm2835 directory with the associated Kconfig and Makefile. Signed-off-by: Markus Mayer <markus.mayer@linaro.org> [swarren, adjust defconfig so ARCH_BCM2835 still gets enabled] Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'arch/arm/configs/bcm2835_defconfig')
-rw-r--r--arch/arm/configs/bcm2835_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig
index f43392dc2dcf..0302d293fba0 100644
--- a/arch/arm/configs/bcm2835_defconfig
+++ b/arch/arm/configs/bcm2835_defconfig
@@ -31,6 +31,7 @@ CONFIG_OPROFILE=y
CONFIG_JUMP_LABEL=y
CONFIG_ARCH_MULTI_V6=y
# CONFIG_ARCH_MULTI_V7 is not set
+CONFIG_ARCH_BCM=y
CONFIG_ARCH_BCM2835=y
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_AEABI=y