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

Commit 916ee924 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: S3C244X: Move S3C2442 code into S3C2440 



Move the remaining S3C2442 code into mach-s3c2440 as there is only one
file currently in there and these two SoCs are very similar.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 1f51bbfd

arch/arm/mach-s3c2440/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -15,6 +15,18 @@ config CPU_S3C2440 
	help

	  Support for S3C2440 Samsung Mobile CPU based systems.



config CPU_S3C2442

	bool

	depends on ARCH_S3C2410

	select CPU_ARM920T

	select S3C2410_CLOCK

	select S3C2410_GPIO

	select S3C2410_PM if PM

	select CPU_S3C244X

	select CPU_LLSERIAL_S3C2440

	help

	  Support for S3C2442 Samsung Mobile CPU based systems.



config S3C2440_DMA

	bool

	depends on ARCH_S3C2410 && CPU_S3C24405B

arch/arm/mach-s3c2440/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ obj-n := 
obj-				:=



obj-$(CONFIG_CPU_S3C2440)	+= s3c2440.o dsc.o

obj-$(CONFIG_CPU_S3C2442)	+= s3c2442.o



obj-$(CONFIG_CPU_S3C2440)	+= irq.o

obj-$(CONFIG_CPU_S3C2440)	+= clock.o

obj-$(CONFIG_S3C2440_DMA)	+= dma.o

arch/arm/mach-s3c2442/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -2,14 +2,3 @@ 
#

# Licensed under GPLv2

config CPU_S3C2442

	bool

	depends on ARCH_S3C2410

	select CPU_ARM920T

	select S3C2410_CLOCK

	select S3C2410_GPIO

	select S3C2410_PM if PM

	select CPU_S3C244X

	select CPU_LLSERIAL_S3C2440

	help

	  Support for S3C2442 Samsung Mobile CPU based systems.