Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7ed099f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 0ec05c3e

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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"

arch/arm/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -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)

arch/arm/plat-spear/Kconfig→arch/arm/mach-spear/Kconfig

+0 −0

File moved.

View file

arch/arm/mach-spear13xx/Makefile→arch/arm/mach-spear/Makefile

+22 −0
Original line number Diff line number Diff line 
#

# Makefile for SPEAr13XX machine series

# 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