summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-12-02 15:12:47 +0100
committerArnd Bergmann <arnd@arndb.de>2013-03-12 17:39:47 +0100
commita7ed099ffc8edf2a6dccd8a22469347f5cdcfa57 (patch)
treeb56901430602574233ad23008cfd7c23babd20c3 /arch/arm/Makefile
parent0ec05c3e4ac6548fcab4b6a74254a22ef251e1fd (diff)
downloadop-kernel-dev-a7ed099ffc8edf2a6dccd8a22469347f5cdcfa57.zip
op-kernel-dev-a7ed099ffc8edf2a6dccd8a22469347f5cdcfa57.tar.gz
ARM: spear: move all files to mach-spear
There are no conflicting files between the three mach-spear* directories and plat-spear any more, so we can now move all file to a common mach-spear directory. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index ee4605f..82765368 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -191,9 +191,7 @@ machine-$(CONFIG_ARCH_VT8500) += vt8500
machine-$(CONFIG_ARCH_W90X900) += w90x900
machine-$(CONFIG_FOOTBRIDGE) += footbridge
machine-$(CONFIG_ARCH_SOCFPGA) += socfpga
-machine-$(CONFIG_ARCH_SPEAR13XX) += spear13xx
-machine-$(CONFIG_ARCH_SPEAR3XX) += spear3xx
-machine-$(CONFIG_MACH_SPEAR600) += spear6xx
+machine-$(CONFIG_PLAT_SPEAR) += spear
machine-$(CONFIG_ARCH_VIRT) += virt
machine-$(CONFIG_ARCH_ZYNQ) += zynq
machine-$(CONFIG_ARCH_SUNXI) += sunxi
@@ -207,7 +205,6 @@ plat-$(CONFIG_PLAT_ORION) += orion
plat-$(CONFIG_PLAT_PXA) += pxa
plat-$(CONFIG_PLAT_S3C24XX) += samsung
plat-$(CONFIG_PLAT_S5P) += samsung
-plat-$(CONFIG_PLAT_SPEAR) += spear
plat-$(CONFIG_PLAT_VERSATILE) += versatile
ifeq ($(CONFIG_ARCH_EBSA110),y)
OpenPOWER on IntegriCloud