vserver 1.9.5.x5

[linux-2.6.git] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 86a05db..112ba27 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -20,26 +20,25 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
-source "init/Kconfig"
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
 
+config CRIS
+       bool
+       default y
+
+source "init/Kconfig"
 
 menu "General setup"
 
 source "fs/Kconfig.binfmt"
 
-config ETRAX_KGDB
-       bool "Use kernel gdb debugger"
-       ---help---
-         The CRIS version of gdb can be used to remotely debug a running
-         Linux kernel via the serial debug port.  Provided you have gdb-cris
-         installed, run gdb-cris vmlinux, then type
-
-         (gdb) set remotebaud 115200           <- kgdb uses 115200 as default
-         (gdb) target remote /dev/ttyS0        <- maybe you use another port
-
-         This should connect you to your booted kernel (or boot it now if you
-         didn't before).  The kernel halts when it boots, waiting for gdb if
-         this option is turned on!
+config ETRAX_CMDLINE
+       string "Kernel command line"
+       default "root=/dev/mtdblock3"
+       help
+         Pass additional commands to the kernel.
 
 config ETRAX_WATCHDOG
        bool "Enable ETRAX watchdog"
@@ -59,7 +58,7 @@ config ETRAX_FAST_TIMER
        bool "Enable ETRAX fast timer API"
        help
          This options enables the API to a fast timer implementation using
-        timer1 to get sub jiffie resolution timers (primarily one-shot 
+        timer1 to get sub jiffie resolution timers (primarily one-shot
         timers).
         This is needed if CONFIG_ETRAX_SERIAL_FAST_TIMER is enabled.
 
@@ -77,7 +76,6 @@ config PREEMPT
 
 endmenu
 
-
 menu "Hardware setup"
 
 choice
@@ -99,22 +97,12 @@ config SVINTO_SIM
        help
          Support the xsim ETRAX Simulator.
 
-config ETRAX200LX
-       bool "ETRAX-200LX-V32"
-       help
-         Support CRIS V32.
-
 endchoice
 
 config ETRAX_ARCH_V10
        bool
        default y if ETRAX100LX || ETRAX100LX_V2
-       default n if !(ETRAX100LX || ETRAX100LX_V2) 
-
-config ETRAX_ARCH_V32
-       bool
-       default y if ETRAX200LX
-       default n if !(ETRAX200LX) 
+       default n if !(ETRAX100LX || ETRAX100LX_V2)
 
 config ETRAX_DRAM_SIZE
        int "DRAM size (dec, in MB)"
@@ -128,35 +116,18 @@ config ETRAX_FLASH_BUSWIDTH
        help
          Width in bytes of the Flash bus (1, 2 or 4). Is usually 2.
 
-config ETRAX_ROOT_DEVICE
-       string "Root device name"
-       default "/dev/mtdblock3"
-       help
-         Specifies the device that should be mounted as root file system
-         when booting from flash. The axisflashmap driver adds an additional
-         mtd partition for the appended root file system image, so this option
-         should normally be the mtdblock device for the partition after the
-         last partition in the partition table.
-
-# duplicate choice configs are not yet supported, so the followinguse 
-# doesn't work:
-
 source arch/cris/arch-v10/Kconfig
 
 endmenu
 
 # bring in ETRAX built-in drivers
 menu "Drivers for built-in interfaces"
-
 source arch/cris/arch-v10/drivers/Kconfig
 
 endmenu
 
 source "drivers/base/Kconfig"
 
-# bring in Etrax built-in drivers
-source "arch/cris/drivers/Kconfig"
-
 # standard linux drivers
 source "drivers/mtd/Kconfig"
 
@@ -200,23 +171,12 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
+source "arch/cris/Kconfig.debug"
 
-menu "Kernel hacking"
-
-#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
-config PROFILE
-       bool "Kernel profiling support"
-
-config PROFILE_SHIFT
-       int "Profile shift count"
-       depends on PROFILE
-       default "2"
-
-endmenu
+source "kernel/vserver/Kconfig"
 
 source "security/Kconfig"
 
 source "crypto/Kconfig"
 
 source "lib/Kconfig"
-