| Message ID | 1393350954-18767-1-git-send-email-jason@lakedaemon.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Feb 25, 2014 at 05:55:54PM +0000, Jason Cooper wrote: > 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> > Signed-off-by: Jason Cooper <jason@lakedaemon.net> > --- > If there are no complaints, I'll be applying this on top of Andrew's kirkwood > migration series in mvebu/soc-kw > > arch/arm/boot/dts/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to mvebu/soc-kw with Kevin's Ack. thx, Jason.
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 := \ kirkwood-ts219-6281.dtb \ kirkwood-ts219-6282.dtb dtb-$(CONFIG_ARCH_KIRKWOOD) += $(kirkwood) +dtb-$(CONFIG_MACH_KIRKWOOD) += $(kirkwood) dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb @@ -133,8 +134,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ armada-xp-gp.dtb \ armada-xp-netgear-rn2120.dtb \ armada-xp-matrix.dtb \ - armada-xp-openblocks-ax3-4.dtb \ - $(kirkwood) + armada-xp-openblocks-ax3-4.dtb dtb-$(CONFIG_ARCH_MXC) += \ imx25-karo-tx25.dtb \ imx25-pdk.dtb \
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> Signed-off-by: Jason Cooper <jason@lakedaemon.net> --- If there are no complaints, I'll be applying this on top of Andrew's kirkwood migration series in mvebu/soc-kw arch/arm/boot/dts/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)