Merge tag 'dma-mapping-4.21' of git://git.infradead.org/users/hch/dma-mapping

[linux-2.6-microblaze.git] / arch / arc / Kconfig

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 7deaabe..ca8e26d 100644 (file)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -24,6 +24,7 @@ config ARC
        select GENERIC_IRQ_SHOW
        select GENERIC_PCI_IOMAP
        select GENERIC_PENDING_IRQ if SMP
        select GENERIC_IRQ_SHOW
        select GENERIC_PCI_IOMAP
        select GENERIC_PENDING_IRQ if SMP

+       select GENERIC_SCHED_CLOCK

        select GENERIC_SMP_IDLE_THREAD
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
        select GENERIC_SMP_IDLE_THREAD
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK


@@ -107,7 +108,7 @@ endmenu
 
 choice
        prompt "ARC Instruction Set"
 
 choice
        prompt "ARC Instruction Set"

-       default ISA_ARCOMPACT
+       default ISA_ARCV2

 
 config ISA_ARCOMPACT
        bool "ARCompact ISA"
 
 config ISA_ARCOMPACT
        bool "ARCompact ISA"


@@ -174,13 +175,11 @@ endchoice
 
 config CPU_BIG_ENDIAN
        bool "Enable Big Endian Mode"
 
 config CPU_BIG_ENDIAN
        bool "Enable Big Endian Mode"

-       default n

        help
          Build kernel for Big Endian Mode of ARC CPU
 
 config SMP
        bool "Symmetric Multi-Processing"
        help
          Build kernel for Big Endian Mode of ARC CPU
 
 config SMP
        bool "Symmetric Multi-Processing"

-       default n

        select ARC_MCIP if ISA_ARCV2
        help
          This enables support for systems with more than one CPU.
        select ARC_MCIP if ISA_ARCV2
        help
          This enables support for systems with more than one CPU.


@@ -252,7 +251,6 @@ config ARC_CACHE_PAGES
 config ARC_CACHE_VIPT_ALIASING
        bool "Support VIPT Aliasing D$"
        depends on ARC_HAS_DCACHE && ISA_ARCOMPACT
 config ARC_CACHE_VIPT_ALIASING
        bool "Support VIPT Aliasing D$"
        depends on ARC_HAS_DCACHE && ISA_ARCOMPACT

-       default n

 
 endif  #ARC_CACHE
 
 
 endif  #ARC_CACHE
 


@@ -260,7 +258,6 @@ config ARC_HAS_ICCM
        bool "Use ICCM"
        help
          Single Cycle RAMS to store Fast Path Code
        bool "Use ICCM"
        help
          Single Cycle RAMS to store Fast Path Code

-       default n

 
 config ARC_ICCM_SZ
        int "ICCM Size in KB"
 
 config ARC_ICCM_SZ
        int "ICCM Size in KB"


@@ -271,7 +268,6 @@ config ARC_HAS_DCCM
        bool "Use DCCM"
        help
          Single Cycle RAMS to store Fast Path Data
        bool "Use DCCM"
        help
          Single Cycle RAMS to store Fast Path Data

-       default n

 
 config ARC_DCCM_SZ
        int "DCCM Size in KB"
 
 config ARC_DCCM_SZ
        int "DCCM Size in KB"


@@ -364,13 +360,11 @@ if ISA_ARCOMPACT
 
 config ARC_COMPACT_IRQ_LEVELS
        bool "Setup Timer IRQ as high Priority"
 
 config ARC_COMPACT_IRQ_LEVELS
        bool "Setup Timer IRQ as high Priority"

-       default n

        # if SMP, LV2 enabled ONLY if ARC implementation has LV2 re-entrancy
        depends on !SMP
 
 config ARC_FPU_SAVE_RESTORE
        bool "Enable FPU state persistence across context switch"
        # if SMP, LV2 enabled ONLY if ARC implementation has LV2 re-entrancy
        depends on !SMP
 
 config ARC_FPU_SAVE_RESTORE
        bool "Enable FPU state persistence across context switch"

-       default n

        help
          Double Precision Floating Point unit had dedicated regs which
          need to be saved/restored across context-switch.
        help
          Double Precision Floating Point unit had dedicated regs which
          need to be saved/restored across context-switch.


@@ -451,7 +445,6 @@ config HIGHMEM
 
 config ARC_HAS_PAE40
        bool "Support for the 40-bit Physical Address Extension"
 
 config ARC_HAS_PAE40
        bool "Support for the 40-bit Physical Address Extension"

-       default n

        depends on ISA_ARCV2
        select HIGHMEM
        select PHYS_ADDR_T_64BIT
        depends on ISA_ARCV2
        select HIGHMEM
        select PHYS_ADDR_T_64BIT


@@ -494,7 +487,6 @@ config HZ
 
 config ARC_METAWARE_HLINK
        bool "Support for Metaware debugger assisted Host access"
 
 config ARC_METAWARE_HLINK
        bool "Support for Metaware debugger assisted Host access"

-       default n

        help
          This options allows a Linux userland apps to directly access
          host file system (open/creat/read/write etc) with help from
        help
          This options allows a Linux userland apps to directly access
          host file system (open/creat/read/write etc) with help from


@@ -522,13 +514,11 @@ config ARC_DW2_UNWIND
 
 config ARC_DBG_TLB_PARANOIA
        bool "Paranoia Checks in Low Level TLB Handlers"
 
 config ARC_DBG_TLB_PARANOIA
        bool "Paranoia Checks in Low Level TLB Handlers"

-       default n

 
 endif
 
 config ARC_UBOOT_SUPPORT
        bool "Support uboot arg Handling"
 
 endif
 
 config ARC_UBOOT_SUPPORT
        bool "Support uboot arg Handling"

-       default n

        help
          ARC Linux by default checks for uboot provided args as pointers to
          external cmdline or DTB. This however breaks in absence of uboot,
        help
          ARC Linux by default checks for uboot provided args as pointers to
          external cmdline or DTB. This however breaks in absence of uboot,