diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-12-02 15:12:47 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-12 17:39:47 +0100 |
commit | a7ed099ffc8edf2a6dccd8a22469347f5cdcfa57 (patch) | |
tree | b56901430602574233ad23008cfd7c23babd20c3 /arch | |
parent | 0ec05c3e4ac6548fcab4b6a74254a22ef251e1fd (diff) |
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')
-rw-r--r-- | arch/arm/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/Makefile | 5 | ||||
-rw-r--r-- | arch/arm/mach-spear/Kconfig (renamed from arch/arm/plat-spear/Kconfig) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/Makefile | 22 | ||||
-rw-r--r-- | arch/arm/mach-spear/Makefile.boot (renamed from arch/arm/mach-spear13xx/Makefile.boot) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/headsmp.S (renamed from arch/arm/mach-spear13xx/headsmp.S) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/hotplug.c (renamed from arch/arm/mach-spear13xx/hotplug.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/include/mach/debug-macro.S (renamed from arch/arm/plat-spear/include/mach/debug-macro.S) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/include/mach/generic.h (renamed from arch/arm/plat-spear/include/mach/generic.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/include/mach/hardware.h (renamed from arch/arm/plat-spear/include/mach/hardware.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/include/mach/irqs.h (renamed from arch/arm/plat-spear/include/mach/irqs.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/include/mach/misc_regs.h (renamed from arch/arm/plat-spear/include/mach/misc_regs.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/include/mach/spear.h (renamed from arch/arm/plat-spear/include/mach/spear.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/include/mach/timex.h (renamed from arch/arm/plat-spear/include/mach/timex.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/include/mach/uncompress.h (renamed from arch/arm/plat-spear/include/mach/uncompress.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/include/plat/pl080.h (renamed from arch/arm/plat-spear/include/plat/pl080.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/pl080.c (renamed from arch/arm/plat-spear/pl080.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/platsmp.c (renamed from arch/arm/mach-spear13xx/platsmp.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/restart.c (renamed from arch/arm/plat-spear/restart.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear1310.c (renamed from arch/arm/mach-spear13xx/spear1310.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear1340.c (renamed from arch/arm/mach-spear13xx/spear1340.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear13xx-dma.h (renamed from arch/arm/mach-spear13xx/spear13xx-dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear13xx.c (renamed from arch/arm/mach-spear13xx/spear13xx.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear300.c (renamed from arch/arm/mach-spear3xx/spear300.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear310.c (renamed from arch/arm/mach-spear3xx/spear310.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear320.c (renamed from arch/arm/mach-spear3xx/spear320.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear3xx.c (renamed from arch/arm/mach-spear3xx/spear3xx.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear6xx.c (renamed from arch/arm/mach-spear6xx/spear6xx.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/time.c (renamed from arch/arm/plat-spear/time.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear13xx/Makefile | 10 | ||||
-rw-r--r-- | arch/arm/mach-spear3xx/Makefile | 15 | ||||
-rw-r--r-- | arch/arm/mach-spear3xx/Makefile.boot | 3 | ||||
-rw-r--r-- | arch/arm/mach-spear6xx/Makefile | 6 | ||||
-rw-r--r-- | arch/arm/mach-spear6xx/Makefile.boot | 3 | ||||
-rw-r--r-- | arch/arm/plat-spear/Makefile | 9 |
35 files changed, 24 insertions, 51 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5b714695b01..4d2b1cf0593 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1104,7 +1104,7 @@ source "arch/arm/plat-samsung/Kconfig" source "arch/arm/mach-socfpga/Kconfig" -source "arch/arm/plat-spear/Kconfig" +source "arch/arm/mach-spear/Kconfig" source "arch/arm/mach-s3c24xx/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index ee4605f400b..8276536815a 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) diff --git a/arch/arm/plat-spear/Kconfig b/arch/arm/mach-spear/Kconfig index e288df90c74..e288df90c74 100644 --- a/arch/arm/plat-spear/Kconfig +++ b/arch/arm/mach-spear/Kconfig diff --git a/arch/arm/mach-spear/Makefile b/arch/arm/mach-spear/Makefile new file mode 100644 index 00000000000..8a937bff9d8 --- /dev/null +++ b/arch/arm/mach-spear/Makefile @@ -0,0 +1,22 @@ +# +# SPEAr Platform specific Makefile +# + +# Common support +obj-y := restart.o time.o + +obj-$(CONFIG_SMP) += headsmp.o platsmp.o +obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o + +obj-$(CONFIG_ARCH_SPEAR13XX) += spear13xx.o +obj-$(CONFIG_MACH_SPEAR1310) += spear1310.o +obj-$(CONFIG_MACH_SPEAR1340) += spear1340.o + +obj-$(CONFIG_ARCH_SPEAR3XX) += spear3xx.o +obj-$(CONFIG_ARCH_SPEAR3XX) += pl080.o +obj-$(CONFIG_MACH_SPEAR300) += spear300.o +obj-$(CONFIG_MACH_SPEAR310) += spear310.o +obj-$(CONFIG_MACH_SPEAR320) += spear320.o + +obj-$(CONFIG_ARCH_SPEAR6XX) += spear6xx.o +obj-$(CONFIG_ARCH_SPEAR6XX) += pl080.o diff --git a/arch/arm/mach-spear13xx/Makefile.boot b/arch/arm/mach-spear/Makefile.boot index 4674a4c221d..4674a4c221d 100644 --- a/arch/arm/mach-spear13xx/Makefile.boot +++ b/arch/arm/mach-spear/Makefile.boot diff --git a/arch/arm/mach-spear13xx/headsmp.S b/arch/arm/mach-spear/headsmp.S index ed85473a047..ed85473a047 100644 --- a/arch/arm/mach-spear13xx/headsmp.S +++ b/arch/arm/mach-spear/headsmp.S diff --git a/arch/arm/mach-spear13xx/hotplug.c b/arch/arm/mach-spear/hotplug.c index a7d2dd11a4f..a7d2dd11a4f 100644 --- a/arch/arm/mach-spear13xx/hotplug.c +++ b/arch/arm/mach-spear/hotplug.c diff --git a/arch/arm/plat-spear/include/mach/debug-macro.S b/arch/arm/mach-spear/include/mach/debug-macro.S index 75b05ad0fba..75b05ad0fba 100644 --- a/arch/arm/plat-spear/include/mach/debug-macro.S +++ b/arch/arm/mach-spear/include/mach/debug-macro.S diff --git a/arch/arm/plat-spear/include/mach/generic.h b/arch/arm/mach-spear/include/mach/generic.h index af47d9b0d83..af47d9b0d83 100644 --- a/arch/arm/plat-spear/include/mach/generic.h +++ b/arch/arm/mach-spear/include/mach/generic.h diff --git a/arch/arm/plat-spear/include/mach/hardware.h b/arch/arm/mach-spear/include/mach/hardware.h index 40a8c178f10..40a8c178f10 100644 --- a/arch/arm/plat-spear/include/mach/hardware.h +++ b/arch/arm/mach-spear/include/mach/hardware.h diff --git a/arch/arm/plat-spear/include/mach/irqs.h b/arch/arm/mach-spear/include/mach/irqs.h index 92da0a8c6bc..92da0a8c6bc 100644 --- a/arch/arm/plat-spear/include/mach/irqs.h +++ b/arch/arm/mach-spear/include/mach/irqs.h diff --git a/arch/arm/plat-spear/include/mach/misc_regs.h b/arch/arm/mach-spear/include/mach/misc_regs.h index 075812c4ca1..075812c4ca1 100644 --- a/arch/arm/plat-spear/include/mach/misc_regs.h +++ b/arch/arm/mach-spear/include/mach/misc_regs.h diff --git a/arch/arm/plat-spear/include/mach/spear.h b/arch/arm/mach-spear/include/mach/spear.h index 2198ab96df9..2198ab96df9 100644 --- a/arch/arm/plat-spear/include/mach/spear.h +++ b/arch/arm/mach-spear/include/mach/spear.h diff --git a/arch/arm/plat-spear/include/mach/timex.h b/arch/arm/mach-spear/include/mach/timex.h index ef95e5b780b..ef95e5b780b 100644 --- a/arch/arm/plat-spear/include/mach/timex.h +++ b/arch/arm/mach-spear/include/mach/timex.h diff --git a/arch/arm/plat-spear/include/mach/uncompress.h b/arch/arm/mach-spear/include/mach/uncompress.h index 51b2dc93e4d..51b2dc93e4d 100644 --- a/arch/arm/plat-spear/include/mach/uncompress.h +++ b/arch/arm/mach-spear/include/mach/uncompress.h diff --git a/arch/arm/plat-spear/include/plat/pl080.h b/arch/arm/mach-spear/include/plat/pl080.h index eb6590ded40..eb6590ded40 100644 --- a/arch/arm/plat-spear/include/plat/pl080.h +++ b/arch/arm/mach-spear/include/plat/pl080.h diff --git a/arch/arm/plat-spear/pl080.c b/arch/arm/mach-spear/pl080.c index cfa1199d0f4..cfa1199d0f4 100644 --- a/arch/arm/plat-spear/pl080.c +++ b/arch/arm/mach-spear/pl080.c diff --git a/arch/arm/mach-spear13xx/platsmp.c b/arch/arm/mach-spear/platsmp.c index af4ade61cd9..af4ade61cd9 100644 --- a/arch/arm/mach-spear13xx/platsmp.c +++ b/arch/arm/mach-spear/platsmp.c diff --git a/arch/arm/plat-spear/restart.c b/arch/arm/mach-spear/restart.c index 7d4616d5df1..7d4616d5df1 100644 --- a/arch/arm/plat-spear/restart.c +++ b/arch/arm/mach-spear/restart.c diff --git a/arch/arm/mach-spear13xx/spear1310.c b/arch/arm/mach-spear/spear1310.c index 56214d1076e..56214d1076e 100644 --- a/arch/arm/mach-spear13xx/spear1310.c +++ b/arch/arm/mach-spear/spear1310.c diff --git a/arch/arm/mach-spear13xx/spear1340.c b/arch/arm/mach-spear/spear1340.c index b01c4c7009a..b01c4c7009a 100644 --- a/arch/arm/mach-spear13xx/spear1340.c +++ b/arch/arm/mach-spear/spear1340.c diff --git a/arch/arm/mach-spear13xx/spear13xx-dma.h b/arch/arm/mach-spear/spear13xx-dma.h index d50bdb60592..d50bdb60592 100644 --- a/arch/arm/mach-spear13xx/spear13xx-dma.h +++ b/arch/arm/mach-spear/spear13xx-dma.h diff --git a/arch/arm/mach-spear13xx/spear13xx.c b/arch/arm/mach-spear/spear13xx.c index 988fefebf81..988fefebf81 100644 --- a/arch/arm/mach-spear13xx/spear13xx.c +++ b/arch/arm/mach-spear/spear13xx.c diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear/spear300.c index 72449eeaa6a..72449eeaa6a 100644 --- a/arch/arm/mach-spear3xx/spear300.c +++ b/arch/arm/mach-spear/spear300.c diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear/spear310.c index 0b7962d2769..0b7962d2769 100644 --- a/arch/arm/mach-spear3xx/spear310.c +++ b/arch/arm/mach-spear/spear310.c diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear/spear320.c index e9db7dbf6c5..e9db7dbf6c5 100644 --- a/arch/arm/mach-spear3xx/spear320.c +++ b/arch/arm/mach-spear/spear320.c diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear/spear3xx.c index d7580f2e5e0..d7580f2e5e0 100644 --- a/arch/arm/mach-spear3xx/spear3xx.c +++ b/arch/arm/mach-spear/spear3xx.c diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear/spear6xx.c index 97fb31d8c9b..97fb31d8c9b 100644 --- a/arch/arm/mach-spear6xx/spear6xx.c +++ b/arch/arm/mach-spear/spear6xx.c diff --git a/arch/arm/plat-spear/time.c b/arch/arm/mach-spear/time.c index bd5c53cd696..bd5c53cd696 100644 --- a/arch/arm/plat-spear/time.c +++ b/arch/arm/mach-spear/time.c diff --git a/arch/arm/mach-spear13xx/Makefile b/arch/arm/mach-spear13xx/Makefile deleted file mode 100644 index 3435ea78c15..00000000000 --- a/arch/arm/mach-spear13xx/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# -# Makefile for SPEAr13XX machine series -# - -obj-$(CONFIG_SMP) += headsmp.o platsmp.o -obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o - -obj-$(CONFIG_ARCH_SPEAR13XX) += spear13xx.o -obj-$(CONFIG_MACH_SPEAR1310) += spear1310.o -obj-$(CONFIG_MACH_SPEAR1340) += spear1340.o diff --git a/arch/arm/mach-spear3xx/Makefile b/arch/arm/mach-spear3xx/Makefile deleted file mode 100644 index 8d12faa178f..00000000000 --- a/arch/arm/mach-spear3xx/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# -# Makefile for SPEAr3XX machine series -# - -# common files -obj-$(CONFIG_ARCH_SPEAR3XX) += spear3xx.o - -# spear300 specific files -obj-$(CONFIG_MACH_SPEAR300) += spear300.o - -# spear310 specific files -obj-$(CONFIG_MACH_SPEAR310) += spear310.o - -# spear320 specific files -obj-$(CONFIG_MACH_SPEAR320) += spear320.o diff --git a/arch/arm/mach-spear3xx/Makefile.boot b/arch/arm/mach-spear3xx/Makefile.boot deleted file mode 100644 index 4674a4c221d..00000000000 --- a/arch/arm/mach-spear3xx/Makefile.boot +++ /dev/null @@ -1,3 +0,0 @@ -zreladdr-y += 0x00008000 -params_phys-y := 0x00000100 -initrd_phys-y := 0x00800000 diff --git a/arch/arm/mach-spear6xx/Makefile b/arch/arm/mach-spear6xx/Makefile deleted file mode 100644 index 898831d93f3..00000000000 --- a/arch/arm/mach-spear6xx/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# -# Makefile for SPEAr6XX machine series -# - -# common files -obj-y += spear6xx.o diff --git a/arch/arm/mach-spear6xx/Makefile.boot b/arch/arm/mach-spear6xx/Makefile.boot deleted file mode 100644 index 4674a4c221d..00000000000 --- a/arch/arm/mach-spear6xx/Makefile.boot +++ /dev/null @@ -1,3 +0,0 @@ -zreladdr-y += 0x00008000 -params_phys-y := 0x00000100 -initrd_phys-y := 0x00800000 diff --git a/arch/arm/plat-spear/Makefile b/arch/arm/plat-spear/Makefile deleted file mode 100644 index 01e88532a5d..00000000000 --- a/arch/arm/plat-spear/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# SPEAr Platform specific Makefile -# - -# Common support -obj-y := restart.o time.o - -obj-$(CONFIG_ARCH_SPEAR3XX) += pl080.o -obj-$(CONFIG_ARCH_SPEAR6XX) += pl080.o |