Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / arch / arm / mach-s3c2410 / Kconfig

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 7b786d725636cb86dc82781a2d28fce1ca166eb2..bbd138be6a70779663bd4aa1798f629e4b81e007 100644 (file)
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -71,16 +71,30 @@ config ARCH_S3C2440
          Say Y here if you are using the SMDK2440.
 
 config SMDK2440_CPU2440
-       bool "SMDK2440 with S3C2440 cpu module"
+       bool "SMDK2440 with S3C2440 CPU module"
        depends on ARCH_S3C2440
        default y if ARCH_S3C2440
        select CPU_S3C2440
 
 config SMDK2440_CPU2442
-       bool "SMDM2440 with S3C2442 cpu module"
+       bool "SMDM2440 with S3C2442 CPU module"
        depends on ARCH_S3C2440
        select CPU_S3C2442
 
+config MACH_S3C2413
+       bool
+       help
+         Internal node for S3C2413 verison of SMDK2413, so that
+         machine_is_s3c2413() will work when MACH_SMDK2413 is
+         selected
+
+config MACH_SMDK2413
+       bool "SMDK2413"
+       select CPU_S3C2412
+       select MACH_S3C2413
+       select MACH_SMDK
+       help
+         Say Y here if you are using an SMDK2413
 
 config MACH_VR1000
        bool "Thorcom VR1000"
@@ -127,6 +141,20 @@ config CPU_S3C2410
          Support for S3C2410 and S3C2410A family from the S3C24XX line
          of Samsung Mobile CPUs.
 
+# internal node to signify if we are only dealing with an S3C2412
+
+config CPU_S3C2412_ONLY
+       bool
+       depends on ARCH_S3C2410 && !CPU_S3C2400 && !CPU_S3C2410 && \
+                  !CPU_S3C2440 && !CPU_S3C2442 && CPU_S3C2412
+       default y if CPU_S3C2412
+
+config CPU_S3C2412
+       bool
+       depends on ARCH_S3C2410
+       help
+         Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
+
 config CPU_S3C244X
        bool
        depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442)