Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 534df0c..970f98d 100644 (file)
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -2,15 +2,38 @@ if ARCH_S3C2410
 
 menu "S3C24XX Implementations"
 
 
 menu "S3C24XX Implementations"
 

+config MACH_ANUBIS
+       bool "Simtec Electronics ANUBIS"
+       select CPU_S3C2440
+       help
+         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

+       select ISA

        help
          Say Y here if you are using the Simtec Electronics EB2410ITX
          development board (also known as BAST)
 
          Product page: <http://www.simtec.co.uk/products/EB2410ITX/>.
 
        help
          Say Y here if you are using the Simtec Electronics EB2410ITX
          development board (also known as BAST)
 
          Product page: <http://www.simtec.co.uk/products/EB2410ITX/>.
 

+config BAST_PC104_IRQ
+       bool "BAST PC104 IRQ support"
+       depends on ARCH_BAST
+       default y
+       help
+         Say Y here to enable the PC104 IRQ routing on the
+         Simtec BAST (EB2410ITX)
+

 config ARCH_H1940
        bool "IPAQ H1940"
        select CPU_S3C2410
 config ARCH_H1940
        bool "IPAQ H1940"
        select CPU_S3C2410


@@ -27,9 +50,15 @@ 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>


@@ -37,6 +66,7 @@ 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.
 


@@ -105,6 +135,14 @@ config S3C2410_BOOT_WATCHDOG
          system resets depends on the value of PCLK. The timeout on an
          200MHz s3c2410 should be about 30 seconds.
 
          system resets depends on the value of PCLK. The timeout on an
          200MHz s3c2410 should be about 30 seconds.
 

+config S3C2410_BOOT_ERROR_RESET
+       bool "S3C2410 Reboot on decompression error"
+       depends on ARCH_S3C2410
+       help
+         Say y here to use the watchdog to reset the system if the
+         kernel decompressor detects an error during decompression.
+
+

 comment "S3C2410 Setup"
 
 config S3C2410_DMA
 comment "S3C2410 Setup"
 
 config S3C2410_DMA


@@ -132,7 +170,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 `Documentation/arm/Samsing-S3C24XX/Suspend.txt`
+         Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>

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


@@ -154,6 +192,11 @@ config S3C2410_PM_CHECK_CHUNKSIZE
          the CRC data block will take more memory, but wil identify any
          faults with better precision.
 
          the CRC data block will take more memory, but wil identify any
          faults with better precision.
 

+config PM_SIMTEC
+       bool
+       depends on PM && (ARCH_BAST || MACH_VR1000)
+       default y
+

 config S3C2410_LOWLEVEL_UART_PORT
        int "S3C2410 UART to use for low-level messages"
        default 0
 config S3C2410_LOWLEVEL_UART_PORT
        int "S3C2410 UART to use for low-level messages"
        default 0