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

Commit 84c028b9 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S3C2443: move mach-s3c2443/* into mach-s3c24xx/ 



This patch moves S3C2443 stuff into mach-s3c24xx/ directory
so that we can merge the s3c24 series' directories to the
just one mach-s3c24xx/ directory.

Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent dd6f01b5

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1072,7 +1072,6 @@ if ARCH_S3C24XX 
source "arch/arm/mach-s3c2412/Kconfig"

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

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

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

endif



if ARCH_S3C64XX

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ machine-$(CONFIG_ARCH_PRIMA2) := prima2 
machine-$(CONFIG_ARCH_PXA)		:= pxa

machine-$(CONFIG_ARCH_REALVIEW)		:= realview

machine-$(CONFIG_ARCH_RPC)		:= rpc

machine-$(CONFIG_ARCH_S3C24XX)		:= s3c24xx s3c2412 s3c2440 s3c2443

machine-$(CONFIG_ARCH_S3C24XX)		:= s3c24xx s3c2412 s3c2440

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx

machine-$(CONFIG_ARCH_S5P64X0)		:= s5p64x0

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

arch/arm/mach-s3c2443/Kconfig

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
# Copyright 2007 Simtec Electronics

#

# Licensed under GPLv2



config CPU_S3C2443

	bool

	depends on ARCH_S3C24XX

	select CPU_ARM920T

	select S3C2443_DMA if S3C2410_DMA

	select CPU_LLSERIAL_S3C2440

	select SAMSUNG_CLKSRC

	select S3C2443_CLOCK

	help

	  Support for the S3C2443 SoC from the S3C24XX line



config S3C2443_DMA

	bool

	depends on CPU_S3C2443

	help

	  Internal config node for S3C2443 DMA support



menu "S3C2443 Machines"



config MACH_SMDK2443

	bool "SMDK2443"

	select CPU_S3C2443

	select MACH_SMDK

	select S3C_DEV_HSMMC1

	help

	  Say Y here if you are using an SMDK2443



endmenu

arch/arm/mach-s3c2443/Makefile

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
# arch/arm/mach-s3c2443/Makefile

#

# Copyright 2007 Simtec Electronics

#

# Licensed under GPLv2



obj-y				:=

obj-m				:=

obj-n				:=

obj-				:=



obj-$(CONFIG_CPU_S3C2443)	+= s3c2443.o

obj-$(CONFIG_CPU_S3C2443)	+= irq.o

obj-$(CONFIG_CPU_S3C2443)	+= clock.o



obj-$(CONFIG_S3C2443_DMA)	+= dma.o



# Machine support



obj-$(CONFIG_MACH_SMDK2443)	+= mach-smdk2443.o

arch/arm/mach-s3c24xx/Kconfig

+29 −0
Original line number Diff line number Diff line
@@ -70,6 +70,17 @@ config CPU_S3C244X 
	def_bool y

	depends on CPU_S3C2440 || CPU_S3C2442



config CPU_S3C2443

	bool "SAMSUNG S3C2443"

	depends on ARCH_S3C24XX

	select CPU_ARM920T

	select CPU_LLSERIAL_S3C2440

	select SAMSUNG_CLKSRC

	select S3C2443_CLOCK

	select S3C2443_DMA if S3C24XX_DMA

	help

	  Support for the S3C2443 SoC from the S3C24XX line



if CPU_S3C2410



config S3C2410_DMA
@@ -460,6 +471,24 @@ config SMDK2440_CPU2442 


endif	# CPU_S3C2440



if CPU_S3C2443



config S3C2443_DMA

	bool

	help

	  Internal config node for S3C2443 DMA support



comment "S3C2443 Boards"



config MACH_SMDK2443

	bool "SMDK2443"

	select MACH_SMDK

	select S3C_DEV_HSMMC1

	help

	  Say Y here if you are using an SMDK2443



endif	# CPU_S3C2443



endmenu	# SAMSUNG S3C24XX SoCs Support



endif	# ARCH_S3C24XX