aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-04 15:34:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-04 15:34:30 -0400
commit150a8dcf109f68f322bf112c7604f2d950303f00 (patch)
treed2219f3de4facbcd34625c733b6fae85ea3b7b8c /arch/arm/boot/dts/Makefile
parente3d98847ded1d183111ff7c4d1ef56b161c7f13e (diff)
parent21bdcc1a2ffce8c9bc7caad711401fff47f99c00 (diff)
Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC board specific changes (part 1) from Olof Johansson: "These changes are all for board specific files. These used to make up a large portion of the ARM changes in the past, but as we are generalizing the support and moving to device tree probing, this has gotten significantly smaller. The only platform actually adding new code here at the moment is Renesas shmobile, as they are still busy converting their code to device tree and have not come far enough to not need it." * tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits) ARM: msm: USB_MSM_OTG needs USB_PHY ARM: davinci: da850 evm: fix const qualifier placement ARM: davinci: da850 board: add remoteproc support ARM: pxa: move debug uart code ARM: pxa: select PXA935 on saar & tavorevb ARM: mmp: add more compatible names in gpio driver ARM: pxa: move PXA_GPIO_TO_IRQ macro ARM: pxa: remove cpu_is_xxx in gpio driver ARM: Kirkwood: update Network Space Mini v2 description ARM: Kirkwood: DT board setup for CloudBox ARM: Kirkwood: sort board entries by ASCII-code order ARM: OMAP: board-4430sdp: Provide regulator to pwm-backlight ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight ARM: OMAP2+: omap2plus_defconfig: Add support for BMP085 pressure sensor omap2+: Remove useless Makefile line omap2+: Remove useless Makefile line ARM: OMAP: RX-51: add missing regulator supply definitions for lis3lv02d ARM: OMAP1: fix omap_udc registration ARM: davinci: use is IS_ENABLED macro ARM: kirkwood: add MACH_GURUPLUG_DT to defconfig ...
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 55196639211d..853e199ea89f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -61,7 +61,8 @@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
61dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ 61dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
62 integratorcp.dtb 62 integratorcp.dtb
63dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb 63dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
64dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ 64dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
65 kirkwood-dns320.dtb \
65 kirkwood-dns325.dtb \ 66 kirkwood-dns325.dtb \
66 kirkwood-dockstar.dtb \ 67 kirkwood-dockstar.dtb \
67 kirkwood-dreamplug.dtb \ 68 kirkwood-dreamplug.dtb \
@@ -75,6 +76,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \
75 kirkwood-lschlv2.dtb \ 76 kirkwood-lschlv2.dtb \
76 kirkwood-lsxhl.dtb \ 77 kirkwood-lsxhl.dtb \
77 kirkwood-mplcec4.dtb \ 78 kirkwood-mplcec4.dtb \
79 kirkwood-netgear_readynas_duo_v2.dtb \
78 kirkwood-ns2.dtb \ 80 kirkwood-ns2.dtb \
79 kirkwood-ns2lite.dtb \ 81 kirkwood-ns2lite.dtb \
80 kirkwood-ns2max.dtb \ 82 kirkwood-ns2max.dtb \
@@ -153,7 +155,9 @@ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
153 ccu9540.dtb 155 ccu9540.dtb
154dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ 156dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
155 r8a7740-armadillo800eva.dtb \ 157 r8a7740-armadillo800eva.dtb \
158 r8a7779-marzen-reference.dtb \
156 sh73a0-kzm9g.dtb \ 159 sh73a0-kzm9g.dtb \
160 sh73a0-kzm9g-reference.dtb \
157 sh7372-mackerel.dtb 161 sh7372-mackerel.dtb
158dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \ 162dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
159 socfpga_vt.dtb 163 socfpga_vt.dtb