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

Commit a21765a7 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 4157/2: S3C24XX: move arch/arch/mach-s3c2410 into cpu components 



The following patch and script moves the arch/arm/mach-s3c2410
directory into arch/arm/plat-s3c24xx for the generic core code
and inti arch/arm/mach-s3c{cpu} for the cpu/machine support files

Include directory include/asm-arm/plat-s3c24xx is added for the
core include files.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d19494b1

arch/arm/Kconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -363,7 +363,15 @@ source "arch/arm/mach-omap1/Kconfig" 




source "arch/arm/mach-omap2/Kconfig"

source "arch/arm/mach-omap2/Kconfig"





source "arch/arm/plat-s3c24xx/Kconfig"



if ARCH_S3C2410

source "arch/arm/mach-s3c2400/Kconfig"

source "arch/arm/mach-s3c2410/Kconfig"

source "arch/arm/mach-s3c2410/Kconfig"

source "arch/arm/mach-s3c2412/Kconfig"

source "arch/arm/mach-s3c2440/Kconfig"

source "arch/arm/mach-s3c2442/Kconfig"

endif





source "arch/arm/mach-lh7a40x/Kconfig"

source "arch/arm/mach-lh7a40x/Kconfig"

arch/arm/Makefile

+6 −1
Original line number Original line Diff line number Diff line
@@ -161,6 +161,10 @@ endif 
# If we have a machine-specific directory, then include it in the build.

# If we have a machine-specific directory, then include it in the build.

core-y				+= arch/arm/kernel/ arch/arm/mm/ arch/arm/common/

core-y				+= arch/arm/kernel/ arch/arm/mm/ arch/arm/common/

core-y				+= $(MACHINE)

core-y				+= $(MACHINE)

core-$(CONFIG_ARCH_S3C2410)	+= arch/arm/mach-s3c2400/

core-$(CONFIG_ARCH_S3C2410)	+= arch/arm/mach-s3c2412/

core-$(CONFIG_ARCH_S3C2410)	+= arch/arm/mach-s3c2440/

core-$(CONFIG_ARCH_S3C2410)	+= arch/arm/mach-s3c2442/

core-$(CONFIG_FPE_NWFPE)	+= arch/arm/nwfpe/

core-$(CONFIG_FPE_NWFPE)	+= arch/arm/nwfpe/

core-$(CONFIG_FPE_FASTFPE)	+= $(FASTFPE_OBJ)

core-$(CONFIG_FPE_FASTFPE)	+= $(FASTFPE_OBJ)

core-$(CONFIG_VFP)		+= arch/arm/vfp/

core-$(CONFIG_VFP)		+= arch/arm/vfp/
@@ -168,6 +172,7 @@ core-$(CONFIG_VFP) += arch/arm/vfp/ 
# If we have a common platform directory, then include it in the build.

# If we have a common platform directory, then include it in the build.

core-$(CONFIG_PLAT_IOP)		+= arch/arm/plat-iop/

core-$(CONFIG_PLAT_IOP)		+= arch/arm/plat-iop/

core-$(CONFIG_ARCH_OMAP)	+= arch/arm/plat-omap/

core-$(CONFIG_ARCH_OMAP)	+= arch/arm/plat-omap/

core-$(CONFIG_PLAT_S3C24XX)		+= arch/arm/plat-s3c24xx/





drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/

drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/

drivers-$(CONFIG_ARCH_CLPS7500)	+= drivers/acorn/char/

drivers-$(CONFIG_ARCH_CLPS7500)	+= drivers/acorn/char/

arch/arm/mach-s3c2400/Kconfig

0 → 100644
+13 −0
Original line number Original line Diff line number Diff line 
# arch/arm/mach-s3c2400/Kconfig

#

# Copyright 2007 Simtec Electronics

#

# Licensed under GPLv2







menu "S3C2400 Machines"





endmenu

arch/arm/mach-s3c2400/Makefile

0 → 100644
+15 −0
Original line number Original line Diff line number Diff line 
# arch/arm/mach-s3c2400/Makefile

#

# Copyright 2007 Simtec Electronics

#

# Licensed under GPLv2



obj-y				:=

obj-m				:=

obj-n				:=

obj-				:=



obj-$(CONFIG_CPU_S3C2400)	+= gpio.o



# Machine support

arch/arm/mach-s3c2410/s3c2400-gpio.c→arch/arm/mach-s3c2400/gpio.c

+1 −1
Original line number Original line Diff line number Diff line 
/* linux/arch/arm/mach-s3c2410/s3c2400-gpio.c

/* linux/arch/arm/mach-s3c2400/gpio.c

 *

 *

 * Copyright (c) 2006 Lucas Correia Villa Real <lucasvr@gobolinux.org>

 * Copyright (c) 2006 Lucas Correia Villa Real <lucasvr@gobolinux.org>

 *

 *