upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 40604ed..534df0c 100644 (file)
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -19,6 +19,14 @@ config ARCH_H1940
 
          <http://www.handhelds.org/projects/h1940.html>.
 
+config MACH_N30
+       bool "Acer N30"
+       select CPU_S3C2410
+       help
+         Say Y here if you are using the Acer N30
+
+         <http://zoo.weinigel.se/n30>.
+
 config ARCH_SMDK2410
        bool "SMDK2410/A9M2410"
        select CPU_S3C2410
@@ -26,6 +34,12 @@ config ARCH_SMDK2410
           Say Y here if you are using the SMDK2410 or the derived module A9M2410
            <http://www.fsforth.de>
 
+config ARCH_S3C2440
+       bool "SMDK2440"
+       select CPU_S3C2440
+       help
+         Say Y here if you are using the SMDK2440.
+
 config MACH_VR1000
        bool "Thorcom VR1000"
        select CPU_S3C2410
@@ -41,9 +55,21 @@ config MACH_RX3715
        help
          Say Y here if you are using the HP iPAQ rx3715.
 
-         See http://www.handhelds.org/projects/rx3715.html for more
+         See <http://www.handhelds.org/projects/rx3715.html> for more
          information on this project
 
+config MACH_OTOM
+       bool "NexVision OTOM Board"
+       select CPU_S3C2410
+       help
+         Say Y here if you are using the Nex Vision OTOM board
+
+config MACH_NEXCODER_2440
+       bool "NexVision NEXCODER 2440 Light Board"
+       select CPU_S3C2440
+       help
+         Say Y here if you are using the Nex Vision NEXCODER 2440 Light Board
+
 endmenu
 
 config CPU_S3C2410
@@ -59,6 +85,26 @@ config CPU_S3C2440
        help
          Support for S3C2440 Samsung Mobile CPU based systems.
 
+comment "S3C2410 Boot"
+
+config S3C2410_BOOT_WATCHDOG
+       bool "S3C2410 Initialisation watchdog"
+       depends on ARCH_S3C2410 && S3C2410_WATCHDOG
+       help
+         Say y to enable the watchdog during the kernel decompression
+         stage. If the kernel fails to uncompress, then the watchdog
+         will trigger a reset and the system should restart.
+
+         Although this uses the same hardware unit as the kernel watchdog
+         driver, it is not a replacement for it. If you use this option,
+         you will have to use the watchdg driver to either stop the timeout
+         or restart it. If you do not, then your kernel will reboot after
+         startup.
+
+         The driver uses a fixed timeout value, so the exact time till the
+         system resets depends on the value of PCLK. The timeout on an
+         200MHz s3c2410 should be about 30 seconds.
+
 comment "S3C2410 Setup"
 
 config S3C2410_DMA
@@ -77,7 +123,7 @@ config S3C2410_DMA_DEBUG
          to the kernel log, at priority KERN_DEBUG.
 
          Note, it is easy to create and fill the log buffer in a small
-         amount of time, as well as using an significant percantage of
+         amount of time, as well as using an significant percentage of
          the CPU time doing so.
 
 
@@ -115,9 +161,9 @@ config S3C2410_LOWLEVEL_UART_PORT
          Choice of which UART port to use for the low-level messages,
          such as the `Uncompressing...` at start time. The value of
          this configuration should be between zero and two. The port
-         must have been initalised by the boot-loader before use.
+         must have been initialised by the boot-loader before use.
 
          Note, this does not affect the port used by the debug messages,
-         which is a seperate configuration.
+         which is a separate configuration.
 
 endif