summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mvebu/Makefile
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2014-02-22 23:14:57 +0400
committerJason Cooper <jason@lakedaemon.net>2014-02-23 01:19:55 +0400
commitba5a37e52194294d60e3d902a05c4471a93dbdee (patch)
tree52860d2ca5e250999a464c35e531603140dacb62 /arch/arm/mach-mvebu/Makefile
parentadc00979a8880a3616d075766188d5dd7e98bb22 (diff)
downloadlinux-ba5a37e52194294d60e3d902a05c4471a93dbdee.tar.xz
ARM: mvebu: Move kirkwood DT boards into mach-mvebu
Move the kirkwood DT support into mach-mvebu, and make them part of ARCH_MULTI_V5. Minimal changes have been made in order to make it boot. Cleanup of the header files and integration with mvebu will take place in following patches. In order to help Debian transition between mach-kirkwood and mach-mvebu, the DTS files are compiled for both, allowing Debian to continue using mach-kirkwood until all remaining boards are supported by mach-mvebu. Debian is then expected to simply swap from mach-kirkwood to mach-mvebu and mach-kirkwood will be removed. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Arnd Bergmann <arnd@arndb.de> Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-mvebu/Makefile')
-rw-r--r--arch/arm/mach-mvebu/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index d99846103bbb..6809ec769dd6 100644
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@ -7,3 +7,4 @@ obj-y += coherency.o coherency_ll.o pmsu.o system-controller.o mvebu-soc-id.
obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
+obj-$(CONFIG_MACH_KIRKWOOD) += kirkwood.o kirkwood-pm.o