linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index bbd138b..0b9d7ca 100644 (file)
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -9,13 +9,6 @@ config MACH_ANUBIS
          Say Y gere if you are using the Simtec Electronics ANUBIS
          development system
 
          Say Y gere if you are using the Simtec Electronics ANUBIS
          development system
 

-config MACH_OSIRIS
-       bool "Simtec IM2440D20 (OSIRIS) module"
-       select CPU_S3C2440
-       help
-         Say Y here if you are using the Simtec IM2440D20 module, also
-         known as the Osiris.
-

 config ARCH_BAST
        bool "Simtec Electronics BAST (EB2410ITX)"
        select CPU_S3C2410
 config ARCH_BAST
        bool "Simtec Electronics BAST (EB2410ITX)"
        select CPU_S3C2410


@@ -50,15 +43,9 @@ config MACH_N30
 
          <http://zoo.weinigel.se/n30>.
 
 
          <http://zoo.weinigel.se/n30>.
 

-config MACH_SMDK
-       bool
-       help
-         Common machine code for SMDK2410 and SMDK2440
-

 config ARCH_SMDK2410
        bool "SMDK2410/A9M2410"
        select CPU_S3C2410
 config ARCH_SMDK2410
        bool "SMDK2410/A9M2410"
        select CPU_S3C2410

-       select MACH_SMDK

        help
           Say Y here if you are using the SMDK2410 or the derived module A9M2410
            <http://www.fsforth.de>
        help
           Say Y here if you are using the SMDK2410 or the derived module A9M2410
            <http://www.fsforth.de>


@@ -66,36 +53,9 @@ config ARCH_SMDK2410
 config ARCH_S3C2440
        bool "SMDK2440"
        select CPU_S3C2440
 config ARCH_S3C2440
        bool "SMDK2440"
        select CPU_S3C2440

-       select MACH_SMDK

        help
          Say Y here if you are using the SMDK2440.
 
        help
          Say Y here if you are using the SMDK2440.
 

-config SMDK2440_CPU2440
-       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"
-       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"
        select CPU_S3C2410
 config MACH_VR1000
        bool "Thorcom VR1000"
        select CPU_S3C2410


@@ -128,55 +88,19 @@ config MACH_NEXCODER_2440
 
 endmenu
 
 
 endmenu
 

-config S3C2410_CLOCK
-       bool
-       help
-         Clock code for the S3C2410, and similar processors
-

 config CPU_S3C2410
        bool
        depends on ARCH_S3C2410
 config CPU_S3C2410
        bool
        depends on ARCH_S3C2410

-       select S3C2410_CLOCK

        help
          Support for S3C2410 and S3C2410A family from the S3C24XX line
          of Samsung Mobile CPUs.
 
        help
          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)
-       help
-         Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems.
-

 config CPU_S3C2440
        bool
        depends on ARCH_S3C2410
 config CPU_S3C2440
        bool
        depends on ARCH_S3C2410

-       select S3C2410_CLOCK
-       select CPU_S3C244X

        help
          Support for S3C2440 Samsung Mobile CPU based systems.
 
        help
          Support for S3C2440 Samsung Mobile CPU based systems.
 

-config CPU_S3C2442
-       bool
-       depends on ARCH_S3C2420
-       select S3C2410_CLOCK
-       select CPU_S3C244X
-       help
-         Support for S3C2442 Samsung Mobile CPU based systems.
-

 comment "S3C2410 Boot"
 
 config S3C2410_BOOT_WATCHDOG
 comment "S3C2410 Boot"
 
 config S3C2410_BOOT_WATCHDOG


@@ -232,7 +156,7 @@ config S3C2410_PM_DEBUG
        depends on ARCH_S3C2410 && PM
        help
          Say Y here if you want verbose debugging from the PM Suspend and
        depends on ARCH_S3C2410 && PM
        help
          Say Y here if you want verbose debugging from the PM Suspend and

-         Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
+         Resume code. See `Documentation/arm/Samsing-S3C24XX/Suspend.txt`

          for more information.
 
 config S3C2410_PM_CHECK
          for more information.
 
 config S3C2410_PM_CHECK