summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2013-12-20 08:58:25 -0800
committerKevin Hilman <khilman@linaro.org>2013-12-20 08:58:51 -0800
commit23621799f24c3c4e8e8dcdf5fdeb3ebd2be148f9 (patch)
treed748b287a26c8e52206aeca675ec63709b1187bf /arch/arm/Makefile
parent7f457160dae592b71b4aac03258237b0f2a67a3e (diff)
parent1c37fa10b275d3e5b6285066b5b27c8feae688c8 (diff)
downloadblackbird-op-linux-23621799f24c3c4e8e8dcdf5fdeb3ebd2be148f9.tar.gz
blackbird-op-linux-23621799f24c3c4e8e8dcdf5fdeb3ebd2be148f9.zip
Merge branch 'berlin/soc' into next/soc
From Sebastian Hesselbarth: * berlin/soc: ARM: add initial support for Marvell Berlin SoCs ARM: add Armada 1500-mini and Chromecast device tree files ARM: add Armada 1500 and Sony NSZ-GS7 device tree files ARM: add Marvell Berlin UART0 lowlevel debug ARM: add Marvell Berlin SoCs to multi_v7_defconfig ARM: add Marvell Berlin SoC familiy to Marvell doc MAINTAINERS: add ARM Marvell Berlin SoC irqchip: add DesignWare APB ICTL interrupt controller Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index c99b1086d83d..483abc7a9834 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -148,6 +148,7 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
machine-$(CONFIG_ARCH_AT91) += at91
machine-$(CONFIG_ARCH_BCM) += bcm
machine-$(CONFIG_ARCH_BCM2835) += bcm2835
+machine-$(CONFIG_ARCH_BERLIN) += berlin
machine-$(CONFIG_ARCH_CLPS711X) += clps711x
machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx
machine-$(CONFIG_ARCH_DAVINCI) += davinci
OpenPOWER on IntegriCloud