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 <[email protected]> Acked-by: Viresh Kumar <[email protected]>
klaby · Mar 12, 2013 · a7ed099 · a7ed099
1 parent 0ec05c3
commit a7ed099
Show file tree

Hide file tree

Showing 35 changed files with 24 additions and 51 deletions.
diff --git 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
@@ -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 → arch/arm/mach-spear/Kconfig b/arch/arm/plat-spear/Kconfig → arch/arm/mach-spear/Kconfig
diff --git a/arch/arm/mach-spear/Makefile 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 → arch/arm/mach-spear/Makefile.boot b/arch/arm/mach-spear13xx/Makefile.boot → arch/arm/mach-spear/Makefile.boot
diff --git a/arch/arm/mach-spear13xx/headsmp.S → arch/arm/mach-spear/headsmp.S b/arch/arm/mach-spear13xx/headsmp.S → arch/arm/mach-spear/headsmp.S
diff --git a/arch/arm/mach-spear13xx/hotplug.c → arch/arm/mach-spear/hotplug.c b/arch/arm/mach-spear13xx/hotplug.c → arch/arm/mach-spear/hotplug.c
diff --git a/...arm/plat-spear/include/mach/debug-macro.S → ...arm/mach-spear/include/mach/debug-macro.S b/...arm/plat-spear/include/mach/debug-macro.S → ...arm/mach-spear/include/mach/debug-macro.S
diff --git a/arch/arm/plat-spear/include/mach/generic.h → arch/arm/mach-spear/include/mach/generic.h b/arch/arm/plat-spear/include/mach/generic.h → arch/arm/mach-spear/include/mach/generic.h
diff --git a/arch/arm/plat-spear/include/mach/hardware.h → arch/arm/mach-spear/include/mach/hardware.h b/arch/arm/plat-spear/include/mach/hardware.h → arch/arm/mach-spear/include/mach/hardware.h
diff --git a/arch/arm/plat-spear/include/mach/irqs.h → arch/arm/mach-spear/include/mach/irqs.h b/arch/arm/plat-spear/include/mach/irqs.h → arch/arm/mach-spear/include/mach/irqs.h
diff --git a/arch/arm/plat-spear/include/mach/misc_regs.h → arch/arm/mach-spear/include/mach/misc_regs.h b/arch/arm/plat-spear/include/mach/misc_regs.h → arch/arm/mach-spear/include/mach/misc_regs.h
diff --git a/arch/arm/plat-spear/include/mach/spear.h → arch/arm/mach-spear/include/mach/spear.h b/arch/arm/plat-spear/include/mach/spear.h → arch/arm/mach-spear/include/mach/spear.h
diff --git a/arch/arm/plat-spear/include/mach/timex.h → arch/arm/mach-spear/include/mach/timex.h b/arch/arm/plat-spear/include/mach/timex.h → arch/arm/mach-spear/include/mach/timex.h
diff --git a/.../arm/plat-spear/include/mach/uncompress.h → .../arm/mach-spear/include/mach/uncompress.h b/.../arm/plat-spear/include/mach/uncompress.h → .../arm/mach-spear/include/mach/uncompress.h
diff --git a/arch/arm/plat-spear/include/plat/pl080.h → arch/arm/mach-spear/include/plat/pl080.h b/arch/arm/plat-spear/include/plat/pl080.h → arch/arm/mach-spear/include/plat/pl080.h
diff --git a/arch/arm/plat-spear/pl080.c → arch/arm/mach-spear/pl080.c b/arch/arm/plat-spear/pl080.c → arch/arm/mach-spear/pl080.c
diff --git a/arch/arm/mach-spear13xx/platsmp.c → arch/arm/mach-spear/platsmp.c b/arch/arm/mach-spear13xx/platsmp.c → arch/arm/mach-spear/platsmp.c
diff --git a/arch/arm/plat-spear/restart.c → arch/arm/mach-spear/restart.c b/arch/arm/plat-spear/restart.c → arch/arm/mach-spear/restart.c
diff --git a/arch/arm/mach-spear13xx/spear1310.c → arch/arm/mach-spear/spear1310.c b/arch/arm/mach-spear13xx/spear1310.c → arch/arm/mach-spear/spear1310.c
diff --git a/arch/arm/mach-spear13xx/spear1340.c → arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear13xx/spear1340.c → arch/arm/mach-spear/spear1340.c
diff --git a/arch/arm/mach-spear13xx/spear13xx-dma.h → arch/arm/mach-spear/spear13xx-dma.h b/arch/arm/mach-spear13xx/spear13xx-dma.h → arch/arm/mach-spear/spear13xx-dma.h
diff --git a/arch/arm/mach-spear13xx/spear13xx.c → arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear13xx/spear13xx.c → arch/arm/mach-spear/spear13xx.c
diff --git a/arch/arm/mach-spear3xx/spear300.c → arch/arm/mach-spear/spear300.c b/arch/arm/mach-spear3xx/spear300.c → arch/arm/mach-spear/spear300.c
diff --git a/arch/arm/mach-spear3xx/spear310.c → arch/arm/mach-spear/spear310.c b/arch/arm/mach-spear3xx/spear310.c → arch/arm/mach-spear/spear310.c
diff --git a/arch/arm/mach-spear3xx/spear320.c → arch/arm/mach-spear/spear320.c b/arch/arm/mach-spear3xx/spear320.c → arch/arm/mach-spear/spear320.c
diff --git a/arch/arm/mach-spear3xx/spear3xx.c → arch/arm/mach-spear/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c → arch/arm/mach-spear/spear3xx.c
diff --git a/arch/arm/mach-spear6xx/spear6xx.c → arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c → arch/arm/mach-spear/spear6xx.c
diff --git a/arch/arm/plat-spear/time.c → arch/arm/mach-spear/time.c b/arch/arm/plat-spear/time.c → arch/arm/mach-spear/time.c
diff --git a/arch/arm/mach-spear13xx/Makefile b/arch/arm/mach-spear13xx/Makefile
diff --git a/arch/arm/mach-spear3xx/Makefile b/arch/arm/mach-spear3xx/Makefile
diff --git a/arch/arm/mach-spear3xx/Makefile.boot b/arch/arm/mach-spear3xx/Makefile.boot
diff --git a/arch/arm/mach-spear6xx/Makefile b/arch/arm/mach-spear6xx/Makefile
diff --git a/arch/arm/mach-spear6xx/Makefile.boot b/arch/arm/mach-spear6xx/Makefile.boot
diff --git a/arch/arm/plat-spear/Makefile b/arch/arm/plat-spear/Makefile