aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2440/Kconfig
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-01-26 16:06:46 +0900
committerBen Dooks <ben-linux@fluff.org>2010-02-01 17:55:25 +0000
commit5cbcccb370355d4cd8534796bf32ac8bb04627cc (patch)
tree357325c8368da597c16224ab04a8a5dd5963c119 /arch/arm/mach-s3c2440/Kconfig
parent87aef30eb3c5dac0491c83fe3b90bc61f1df24ec (diff)
downloadkernel_samsung_smdk4412-5cbcccb370355d4cd8534796bf32ac8bb04627cc.zip
kernel_samsung_smdk4412-5cbcccb370355d4cd8534796bf32ac8bb04627cc.tar.gz
kernel_samsung_smdk4412-5cbcccb370355d4cd8534796bf32ac8bb04627cc.tar.bz2
ARM: S3C24XX: Merge s3c2442 and s3c2440 machines into mach-s3c2440
Move the pair of machines in arch/arm/mach-s3c2442 into the mach-s3c2440 directory as the S3C2440 and S3C2442 are very close. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2440/Kconfig')
-rw-r--r--arch/arm/mach-s3c2440/Kconfig20
1 files changed, 18 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
index 8087935..5486929 100644
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@ -21,8 +21,7 @@ config S3C2440_DMA
help
Support for S3C2440 specific DMA code5A
-
-menu "S3C2440 Machines"
+menu "S3C2440 and S3C2442 Machines"
config MACH_ANUBIS
bool "Simtec Electronics ANUBIS"
@@ -37,6 +36,18 @@ config MACH_ANUBIS
Say Y here if you are using the Simtec Electronics ANUBIS
development system
+config MACH_NEO1973_GTA02
+ bool "Openmoko GTA02 / Freerunner phone"
+ select CPU_S3C2442
+ select MFD_PCF50633
+ select PCF50633_GPIO
+ select I2C
+ select POWER_SUPPLY
+ select MACH_NEO1973
+ select S3C2410_PWM
+ help
+ Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone
+
config MACH_OSIRIS
bool "Simtec IM2440D20 (OSIRIS) module"
select CPU_S3C2440
@@ -99,6 +110,11 @@ config SMDK2440_CPU2440
select S3C2440_XTAL_16934400
select CPU_S3C2440
+config SMDK2440_CPU2442
+ bool "SMDM2440 with S3C2442 CPU module"
+ depends on ARCH_S3C2440
+ select CPU_S3C2442
+
config MACH_AT2440EVB
bool "Avantech AT2440EVB development board"
select CPU_S3C2440