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

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
...@@ -1072,7 +1072,6 @@ if ARCH_S3C24XX ...@@ -1072,7 +1072,6 @@ if ARCH_S3C24XX
source "arch/arm/mach-s3c2412/Kconfig" source "arch/arm/mach-s3c2412/Kconfig"
source "arch/arm/mach-s3c2416/Kconfig" source "arch/arm/mach-s3c2416/Kconfig"
source "arch/arm/mach-s3c2440/Kconfig" source "arch/arm/mach-s3c2440/Kconfig"
source "arch/arm/mach-s3c2443/Kconfig"
endif endif
if ARCH_S3C64XX if ARCH_S3C64XX
......
...@@ -175,7 +175,7 @@ machine-$(CONFIG_ARCH_PRIMA2) := prima2 ...@@ -175,7 +175,7 @@ machine-$(CONFIG_ARCH_PRIMA2) := prima2
machine-$(CONFIG_ARCH_PXA) := pxa machine-$(CONFIG_ARCH_PXA) := pxa
machine-$(CONFIG_ARCH_REALVIEW) := realview machine-$(CONFIG_ARCH_REALVIEW) := realview
machine-$(CONFIG_ARCH_RPC) := rpc 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_S3C64XX) := s3c64xx
machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0
machine-$(CONFIG_ARCH_S5PC100) := s5pc100 machine-$(CONFIG_ARCH_S5PC100) := s5pc100
......
# 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
#
# 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
...@@ -70,6 +70,17 @@ config CPU_S3C244X ...@@ -70,6 +70,17 @@ config CPU_S3C244X
def_bool y def_bool y
depends on CPU_S3C2440 || CPU_S3C2442 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 if CPU_S3C2410
config S3C2410_DMA config S3C2410_DMA
...@@ -460,6 +471,24 @@ config SMDK2440_CPU2442 ...@@ -460,6 +471,24 @@ config SMDK2440_CPU2442
endif # CPU_S3C2440 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 endmenu # SAMSUNG S3C24XX SoCs Support
endif # ARCH_S3C24XX endif # ARCH_S3C24XX
...@@ -31,6 +31,9 @@ obj-$(CONFIG_CPU_S3C2442) += s3c2442.o ...@@ -31,6 +31,9 @@ obj-$(CONFIG_CPU_S3C2442) += s3c2442.o
obj-$(CONFIG_CPU_S3C244X) += s3c244x.o irq-s3c244x.o clock-s3c244x.o obj-$(CONFIG_CPU_S3C244X) += s3c244x.o irq-s3c244x.o clock-s3c244x.o
obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o
obj-$(CONFIG_CPU_S3C2443) += s3c2443.o irq-s3c2443.o clock-s3c2443.o
obj-$(CONFIG_S3C2443_DMA) += dma-s3c2443.o
# #
# machine support # machine support
# following is ordered alphabetically by option text. # following is ordered alphabetically by option text.
...@@ -66,6 +69,8 @@ obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o ...@@ -66,6 +69,8 @@ obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o
obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
obj-$(CONFIG_MACH_RX1950) += mach-rx1950.o obj-$(CONFIG_MACH_RX1950) += mach-rx1950.o
obj-$(CONFIG_MACH_SMDK2443) += mach-smdk2443.o
# common bits of machine support # common bits of machine support
obj-$(CONFIG_SIMTEC_NOR) += nor-simtec.o obj-$(CONFIG_SIMTEC_NOR) += nor-simtec.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment