diff options
author | Jason Cooper <jason@lakedaemon.net> | 2014-02-25 12:14:21 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-02-25 15:12:36 -0500 |
commit | 1b82af4f1749119fca8e07451223da10d3ca938d (patch) | |
tree | 9b4040d1c6618bb92dbd706c835db197189c1d35 /arch/arm/boot | |
parent | 5a51da2512513c5876340d7b4b84cc86ad1f4bfe (diff) |
ARM: kirkwood: select dtbs based on SoC
To prevent problems later with mvebu_v5_defconfig builds, we restrict
the scope of the changes this series makes.
Selecting ARCH_KIRKWOOD and MACH_KIRKWOOD is necessary during the
migration from mach-kirkwood to mach-mvebu. Until the last four legacy
kirkwood board files have a DT equivalent, we need to support building
DT from both mach-kirkwood and mach-mvebu.
Reported-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index e135182992b2..88010f97a368 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
@@ -117,6 +117,7 @@ kirkwood := \ | |||
117 | kirkwood-ts219-6281.dtb \ | 117 | kirkwood-ts219-6281.dtb \ |
118 | kirkwood-ts219-6282.dtb | 118 | kirkwood-ts219-6282.dtb |
119 | dtb-$(CONFIG_ARCH_KIRKWOOD) += $(kirkwood) | 119 | dtb-$(CONFIG_ARCH_KIRKWOOD) += $(kirkwood) |
120 | dtb-$(CONFIG_MACH_KIRKWOOD) += $(kirkwood) | ||
120 | dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb | 121 | dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb |
121 | dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb | 122 | dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb |
122 | dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb | 123 | dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb |
@@ -133,8 +134,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ | |||
133 | armada-xp-gp.dtb \ | 134 | armada-xp-gp.dtb \ |
134 | armada-xp-netgear-rn2120.dtb \ | 135 | armada-xp-netgear-rn2120.dtb \ |
135 | armada-xp-matrix.dtb \ | 136 | armada-xp-matrix.dtb \ |
136 | armada-xp-openblocks-ax3-4.dtb \ | 137 | armada-xp-openblocks-ax3-4.dtb |
137 | $(kirkwood) | ||
138 | dtb-$(CONFIG_ARCH_MXC) += \ | 138 | dtb-$(CONFIG_ARCH_MXC) += \ |
139 | imx25-karo-tx25.dtb \ | 139 | imx25-karo-tx25.dtb \ |
140 | imx25-pdk.dtb \ | 140 | imx25-pdk.dtb \ |