summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2013-10-14 22:58:37 +0200
committerKevin Hilman <khilman@linaro.org>2013-10-14 23:00:10 +0200
commit4fd0376356ed2e1f6c2a4e8628782aedf903292e (patch)
tree581f8dbb860ca6176c543379bc455bdc4a95c088 /arch/arm/boot/dts/Makefile
parentMerge tag 'renesas-defconfig-for-v3.13' of git://git.kernel.org/pub/scm/linux... (diff)
parentARM: shmobile: marzen: enable INTC IRQ (diff)
downloadlinux-4fd0376356ed2e1f6c2a4e8628782aedf903292e.tar.xz
linux-4fd0376356ed2e1f6c2a4e8628782aedf903292e.zip
Merge branch 'renesas/boards2' into next/boards
From Simon Horman: * renesas/boards2: (64 commits) ARM: shmobile: marzen: enable INTC IRQ ARM: shmobile: bockw: add SMSC support on reference ARM: shmobile: Use SMP on Koelsch ARM: shmobile: Remove KZM9D reference DTS ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB ARM: shmobile: Remove non-multiplatform KZM9D reference support ARM: shmobile: Use KZM9D without reference for multiplatform ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS ARM: shmobile: Use arch timer on Koelsch ARM: shmobile: Use r8a7791_add_standard_devices() on Koelsch ARM: shmobile: Genmai support ARM: shmobile: marzen: enable DMA for SDHI0 ARM: shmobile: bockw: enable DMA for SDHI0 ARM: shmobile: ape6evm: add DMA support to MMCIF ARM: shmobile: r8a7791 SMP support ARM: shmobile: r8a7779: split r8a7779_init_irq_extpin() for DT ARM: shmobile: r8a7778: split r8a7778_init_irq_extpin() for DT ARM: shmobile: r7s72100 SCIF support ARM: shmobile: Initial r7s72100 SoC support ARM: shmobile: r8a7791 Arch timer workaround ... Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index fd4651038a19..c74de27ace41 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -196,7 +196,7 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
ste-ccu9540.dtb
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
- emev2-kzm9d-reference.dtb \
+ r7s72100-genmai.dtb \
r8a7740-armadillo800eva.dtb \
r8a7778-bockw.dtb \
r8a7778-bockw-reference.dtb \
@@ -211,7 +211,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
r8a73a4-ape6evm.dtb \
r8a73a4-ape6evm-reference.dtb \
sh7372-mackerel.dtb
-dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb
+dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb
dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
socfpga_vt.dtb
dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \