summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm/Makefile
diff options
context:
space:
mode:
authorMarkus Mayer <markus.mayer@linaro.org>2014-02-20 16:16:11 -0800
committerStephen Warren <swarren@wwwdotorg.org>2014-02-24 19:42:35 -0700
commitd30fe6272183f3cc8b9f3f111cd36271332e4cec (patch)
treeb687736f4e0c2fc441c40db4dc917c7b1e47730c /arch/arm/mach-bcm/Makefile
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
downloadtalos-obmc-linux-d30fe6272183f3cc8b9f3f111cd36271332e4cec.tar.gz
talos-obmc-linux-d30fe6272183f3cc8b9f3f111cd36271332e4cec.zip
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/mach-bcm/Makefile')
-rw-r--r--arch/arm/mach-bcm/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index c2ccd5a0f772..0ad293882079 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -11,5 +11,7 @@
# GNU General Public License for more details.
obj-$(CONFIG_ARCH_BCM_MOBILE) := board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o
+obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o
+
plus_sec := $(call as-instr,.arch_extension sec,+sec)
AFLAGS_bcm_kona_smc_asm.o :=-Wa,-march=armv7-a$(plus_sec)
OpenPOWER on IntegriCloud