Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
[linux-2.6-block.git] / arch / arc / Kconfig
index cd4ad61c4c14bf7343fead74f23b38f5faddc62f..e6f4eca09ee36f5cbbe9ade6aadf07aa17ef6332 100644 (file)
@@ -8,7 +8,6 @@
 
 config ARC
        def_bool y
-       select ARCH_NO_VIRT_TO_BUS
        select CLONE_BACKWARDS
        # ARC Busybox based initramfs absolutely relies on DEVTMPFS for /dev
        select DEVTMPFS if !INITRAMFS_SOURCE=""
@@ -20,12 +19,11 @@ config ARC
        select GENERIC_KERNEL_EXECVE
        select GENERIC_KERNEL_THREAD
        select GENERIC_PENDING_IRQ if SMP
-       select GENERIC_SIGALTSTACK
        select GENERIC_SMP_IDLE_THREAD
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
        select HAVE_GENERIC_HARDIRQS
-       select HAVE_IRQ_WORK
+       select HAVE_IOREMAP_PROT
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_MEMBLOCK
@@ -81,21 +79,12 @@ source "kernel/Kconfig.freezer"
 
 menu "ARC Architecture Configuration"
 
-choice
-       prompt "ARC Platform"
-       default ARC_PLAT_FPGA_LEGACY
-
-config ARC_PLAT_FPGA_LEGACY
-       bool "\"Legacy\" ARC FPGA dev platform"
-       help
-         Support for ARC development platforms, provided by Synopsys.
-         These are based on FPGA or ISS. e.g.
-         - ARCAngel4
-         - ML509
-         - MetaWare ISS
+menu "ARC Platform/SoC/Board"
 
+source "arch/arc/plat-arcfpga/Kconfig"
 #New platform adds here
-endchoice
+
+endmenu
 
 menu "ARC CPU Configuration"
 
@@ -127,6 +116,10 @@ config CPU_BIG_ENDIAN
        help
          Build kernel for Big Endian Mode of ARC CPU
 
+# If a platform can't work with 0x8000_0000 based dma_addr_t
+config ARC_PLAT_NEEDS_CPU_TO_DMA
+       bool
+
 config SMP
        bool "Symmetric Multi-Processing (Incomplete)"
        default n
@@ -339,12 +332,6 @@ config ARC_HAS_RTSC
 
 endmenu   # "ARC CPU Configuration"
 
-menu "Platform Board Configuration"
-
-source "arch/arc/plat-arcfpga/Kconfig"
-
-#New platform adds here
-
 config LINUX_LINK_BASE
        hex "Linux Link Address"
        default "0x80000000"
@@ -358,8 +345,6 @@ config LINUX_LINK_BASE
          Linux needs to be scooted a bit.
          If you don't know what the above means, leave this setting alone.
 
-endmenu # "Platform Board Configuration"
-
 config ARC_CURR_IN_REG
        bool "Dedicate Register r25 for current_task pointer"
        default y