diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 06:50:05 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 07:13:09 -0400 |
commit | 54cab10f63f20750cd2911e353cf8068f1ecf0a5 (patch) | |
tree | 33469b47a3cabd27b09bc9f52359f2ac3c2fa453 /arch/arm/boot/dts/Makefile | |
parent | e887ae25b03c3608229de4fac6024c14f369a75e (diff) | |
parent | 00e8ec2f0b05bfc8acaf13cf91c2ca1e624f3535 (diff) |
Merge branch 'mvebu/soc3' into next/dt
The dts Makefile has a bunch of nasty conflicts, attempt to resolve
these now to avoid trouble later.
Conflicts:
arch/arm/boot/dts/Makefile
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 489959dfe6d1..3d34936fb476 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
@@ -55,7 +55,7 @@ dtb-$(CONFIG_ARCH_BERLIN) += \ | |||
55 | berlin2cd-google-chromecast.dtb | 55 | berlin2cd-google-chromecast.dtb |
56 | dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ | 56 | dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ |
57 | da850-evm.dtb | 57 | da850-evm.dtb |
58 | dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \ | 58 | dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \ |
59 | dove-cubox.dtb \ | 59 | dove-cubox.dtb \ |
60 | dove-d2plug.dtb \ | 60 | dove-d2plug.dtb \ |
61 | dove-d3plug.dtb \ | 61 | dove-d3plug.dtb \ |
@@ -82,8 +82,8 @@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \ | |||
82 | ecx-2000.dtb | 82 | ecx-2000.dtb |
83 | dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ | 83 | dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ |
84 | integratorcp.dtb | 84 | integratorcp.dtb |
85 | dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb | 85 | kirkwood := \ |
86 | dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \ | 86 | kirkwood-b3.dtb \ |
87 | kirkwood-cloudbox.dtb \ | 87 | kirkwood-cloudbox.dtb \ |
88 | kirkwood-db-88f6281.dtb \ | 88 | kirkwood-db-88f6281.dtb \ |
89 | kirkwood-db-88f6282.dtb \ | 89 | kirkwood-db-88f6282.dtb \ |
@@ -139,6 +139,9 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \ | |||
139 | kirkwood-ts219-6282.dtb \ | 139 | kirkwood-ts219-6282.dtb \ |
140 | kirkwood-ts419-6281.dtb \ | 140 | kirkwood-ts419-6281.dtb \ |
141 | kirkwood-ts419-6282.dtb | 141 | kirkwood-ts419-6282.dtb |
142 | dtb-$(CONFIG_ARCH_KIRKWOOD) += $(kirkwood) | ||
143 | dtb-$(CONFIG_MACH_KIRKWOOD) += $(kirkwood) | ||
144 | dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb | ||
142 | dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb | 145 | dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb |
143 | dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb | 146 | dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb |
144 | dtb-$(CONFIG_ARCH_MXC) += \ | 147 | dtb-$(CONFIG_ARCH_MXC) += \ |