Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[sfrench/cifs-2.6.git] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 0e9926d71a31bc34b3f00dfa7a89afedb40cc509..9389d38f222f2f749497b106872278a7da5bdd0b 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -47,9 +47,6 @@ config GENERIC_CALIBRATE_DELAY
 config NO_IOPORT
        def_bool y
 
-config NO_IOMEM
-       def_bool y
-
 config FORCE_MAX_ZONEORDER
        int
        default 6
@@ -57,6 +54,11 @@ config FORCE_MAX_ZONEORDER
 config CRIS
        bool
        default y
+       select HAVE_IDE
+
+config HZ
+       int
+       default 100
 
 source "init/Kconfig"
 
@@ -262,6 +264,33 @@ menu "Drivers for built-in interfaces"
 source arch/cris/arch-v10/drivers/Kconfig
 source arch/cris/arch-v32/drivers/Kconfig
 
+config ETRAX_AXISFLASHMAP
+       bool "Axis flash-map support"
+       select MTD
+       select MTD_CFI
+       select MTD_CFI_AMDSTD
+       select MTD_JEDECPROBE if ETRAX_ARCH_V32
+       select MTD_CHAR
+       select MTD_BLOCK
+       select MTD_PARTITIONS
+       select MTD_CONCAT
+       select MTD_COMPLEX_MAPPINGS
+       help
+         This option enables MTD mapping of flash devices.  Needed to use
+         flash memories.  If unsure, say Y.
+
+config ETRAX_RTC
+       bool "Real Time Clock support"
+       depends on ETRAX_I2C
+       help
+         Enables drivers for the Real-Time Clock battery-backed chips on
+         some products. The kernel reads the time when booting, and
+         the date can be set using ioctl(fd, RTC_SET_TIME, &rt) with rt a
+         rtc_time struct (see <file:include/asm-cris/rtc.h>) on the /dev/rtc
+         device.  You can check the time with cat /proc/rtc, but
+         normal time reading should be done using libc function time and
+         friends.
+
 choice
        prompt "RTC chip"
        depends on ETRAX_RTC
@@ -283,6 +312,37 @@ config ETRAX_PCF8563
 
 endchoice
 
+config ETRAX_SYNCHRONOUS_SERIAL
+       bool "Synchronous serial-port support"
+       help
+         Select this to enable the synchronous serial port driver.
+
+config ETRAX_SYNCHRONOUS_SERIAL_PORT0
+       bool "Synchronous serial port 0 enabled"
+       depends on ETRAX_SYNCHRONOUS_SERIAL
+       help
+         Enabled synchronous serial port 0.
+
+config ETRAX_SYNCHRONOUS_SERIAL0_DMA
+       bool "Enable DMA on synchronous serial port 0."
+       depends on ETRAX_SYNCHRONOUS_SERIAL_PORT0
+       help
+         A synchronous serial port can run in manual or DMA mode.
+         Selecting this option will make it run in DMA mode.
+
+config ETRAX_SYNCHRONOUS_SERIAL_PORT1
+       bool "Synchronous serial port 1 enabled"
+       depends on ETRAX_SYNCHRONOUS_SERIAL && (ETRAXFS || ETRAX_ARCH_V10)
+       help
+         Enabled synchronous serial port 1.
+
+config ETRAX_SYNCHRONOUS_SERIAL1_DMA
+       bool "Enable DMA on synchronous serial port 1."
+       depends on ETRAX_SYNCHRONOUS_SERIAL_PORT1
+       help
+         A synchronous serial port can run in manual or DMA mode.
+         Selecting this option will make it run in DMA mode.
+
 choice
        prompt "Network LED behavior"
        depends on ETRAX_ETHERNET