m68k: merge mmu and non-mmu versions of processor.h

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

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index ec85c0d6c6da48677fca66e507e1dc52d64118f0..b86e19c9b5b0a137c297f5a1a55e1be49b7d250b 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -5,8 +5,11 @@
 config FRV
        bool
        default y
+       select HAVE_IDE
+       select HAVE_ARCH_TRACEHOOK
+       select HAVE_PERF_COUNTERS
 
-config UID16
+config ZONE_DMA
        bool
        default y
 
@@ -21,18 +24,52 @@ config GENERIC_FIND_NEXT_BIT
        bool
        default y
 
+config GENERIC_HWEIGHT
+       bool
+       default y
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default n
 
 config GENERIC_HARDIRQS
        bool
-       default n
+       default y
+
+config GENERIC_HARDIRQS_NO__DO_IRQ
+       bool
+       default y
+
+config GENERIC_TIME
+       bool
+       default y
+
+config TIME_LOW_RES
+       bool
+       default y
+
+config QUICKLIST
+       bool
+       default y
+
+config ARCH_HAS_ILOG2_U32
+       bool
+       default y
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default y
+
+config HZ
+       int
+       default 1000
 
 mainmenu "Fujitsu FR-V Kernel Configuration"
 
 source "init/Kconfig"
 
+source "kernel/Kconfig.freezer"
+
 
 menu "Fujitsu FR-V system setup"
 
@@ -51,7 +88,7 @@ config FRV_OUTOFLINE_ATOMIC_OPS
          Setting this option causes the FR-V atomic operations to be mostly
          implemented out-of-line.
 
-         See Documentation/fujitsu/frv/atomic-ops.txt for more information.
+         See Documentation/frv/atomic-ops.txt for more information.
 
 config HIGHMEM
        bool "High memory support"
@@ -110,6 +147,15 @@ config UCPAGE_OFFSET_C0000000
 
 endchoice
 
+config PAGE_OFFSET
+       hex
+       default 0x20000000 if UCPAGE_OFFSET_20000000
+       default 0x40000000 if UCPAGE_OFFSET_40000000
+       default 0x60000000 if UCPAGE_OFFSET_60000000
+       default 0x80000000 if UCPAGE_OFFSET_80000000
+       default 0xA0000000 if UCPAGE_OFFSET_A0000000
+       default 0xC0000000
+
 config PROTECT_KERNEL
        bool "Protect core kernel against userspace"
        depends on !MMU
@@ -243,6 +289,12 @@ config MB93091_NO_MB
 endchoice
 endif
 
+config FUJITSU_MB93493
+       bool "MB93493 Multimedia chip"
+       help
+         Select this option if the MB93493 multimedia chip is going to be
+         used.
+
 choice
        prompt "GP-Relative data support"
        default GPREL_DATA_8
@@ -274,6 +326,11 @@ config GPREL_DATA_NONE
 
 endchoice
 
+config FRV_ONCPU_SERIAL
+       bool "Use on-CPU serial ports"
+       select SERIAL_8250
+       default y
+
 config PCI
        bool "Use PCI"
        depends on MB93090_MB00
@@ -283,11 +340,6 @@ config PCI
          onboard. If you have one of these boards and you wish to use the PCI
          facilities, say Y here.
 
-         The PCI-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>, contains valuable
-         information about which PCI hardware does work under Linux and which
-         doesn't.
-
 config RESERVE_DMA_COHERENT
        bool "Reserve DMA coherent memory"
        depends on PCI && !MMU
@@ -305,23 +357,7 @@ config RESERVE_DMA_COHERENT
 
 source "drivers/pci/Kconfig"
 
-config PCMCIA
-       tristate "Use PCMCIA"
-       help
-         Say Y here if you want to attach PCMCIA- or PC-cards to your FR-V
-         board.  These are credit-card size devices such as network cards,
-         modems or hard drives often used with laptops computers.  There are
-         actually two varieties of these cards: the older 16 bit PCMCIA cards
-         and the newer 32 bit CardBus cards.  If you want to use CardBus
-         cards, you need to say Y here and also to "CardBus support" below.
-
-         To use your PC-cards, you will need supporting software from David
-         Hinds pcmcia-cs package (see the file <file:Documentation/Changes>
-         for location).  Please also read the PCMCIA-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>.
-
-         To compile this driver as modules, choose M here: the
-         modules will be called pcmcia_core and ds.
+source "drivers/pcmcia/Kconfig"
 
 #config MATH_EMULATION
 #      bool "Math emulation support (EXPERIMENTAL)"
@@ -334,6 +370,11 @@ config PCMCIA
 #        should probably wait a while.
 
 menu "Power management options"
+
+config ARCH_SUSPEND_POSSIBLE
+       def_bool y
+       depends on !SMP
+
 source kernel/power/Kconfig
 endmenu