Merge tag 'kconfig-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiro...

[linux-2.6-block.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 4dadf83d9d5c2e93888497c89d1aee5ce3101bfb..2890d36eb53116e9237944db4fd1862e480e262c 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -128,6 +128,7 @@ config PPC
        #
        # Please keep this list sorted alphabetically.
        #
+       select ARCH_HAS_DEBUG_VIRTUAL
        select ARCH_HAS_DEVMEM_IS_ALLOWED
        select ARCH_HAS_DMA_SET_COHERENT_MASK
        select ARCH_HAS_ELF_RANDOMIZE
@@ -138,7 +139,6 @@ config PPC
        select ARCH_HAS_PTE_SPECIAL
        select ARCH_HAS_MEMBARRIER_CALLBACKS
        select ARCH_HAS_SCALED_CPUTIME          if VIRT_CPU_ACCOUNTING_NATIVE && PPC64
-       select ARCH_HAS_SG_CHAIN
        select ARCH_HAS_STRICT_KERNEL_RWX       if ((PPC_BOOK3S_64 || PPC32) && !RELOCATABLE && !HIBERNATION)
        select ARCH_HAS_TICK_BROADCAST          if GENERIC_CLOCKEVENTS_BROADCAST
        select ARCH_HAS_UACCESS_FLUSHCACHE      if PPC64
@@ -377,9 +377,9 @@ config PPC_ADV_DEBUG_DAC_RANGE
        depends on PPC_ADV_DEBUG_REGS && 44x
        default y
 
-config ZONE_DMA32
+config ZONE_DMA
        bool
-       default y if PPC64
+       default y if PPC_BOOK3E_64
 
 config PGTABLE_LEVELS
        int
@@ -396,7 +396,7 @@ config HIGHMEM
        bool "High memory support"
        depends on PPC32
 
-source kernel/Kconfig.hz
+source "kernel/Kconfig.hz"
 
 config HUGETLB_PAGE_SIZE_VARIABLE
        bool
@@ -559,7 +559,7 @@ config RELOCATABLE_TEST
 
 config CRASH_DUMP
        bool "Build a dump capture kernel"
-       depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
+       depends on PPC64 || PPC_BOOK3S_32 || FSL_BOOKE || (44x && !SMP)
        select RELOCATABLE if PPC64 || 44x || FSL_BOOKE
        help
          Build a kernel suitable for use as a dump capture kernel.
@@ -819,7 +819,7 @@ config ARCH_WANTS_FREEZER_CONTROL
        def_bool y
        depends on ADB_PMU
 
-source kernel/power/Kconfig
+source "kernel/power/Kconfig"
 
 config SECCOMP
        bool "Enable seccomp to safely compute untrusted bytecode"
@@ -872,10 +872,6 @@ config ISA
          have an IBM RS/6000 or pSeries machine, say Y.  If you have an
          embedded board, consult your board documentation.
 
-config ZONE_DMA
-       bool
-       default y
-
 config GENERIC_ISA_DMA
        bool
        depends on ISA_DMA_API
@@ -1057,7 +1053,7 @@ config PHYSICAL_START_BOOL
 
 config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if PHYSICAL_START_BOOL
-       default "0x02000000" if PPC_STD_MMU && CRASH_DUMP && !NONSTATIC_KERNEL
+       default "0x02000000" if PPC_BOOK3S && CRASH_DUMP && !NONSTATIC_KERNEL
        default "0x00000000"
 
 config PHYSICAL_ALIGN
@@ -1107,7 +1103,7 @@ config PIN_TLB_DATA
 
 config PIN_TLB_IMMR
        bool "Pinned TLB for IMMR"
-       depends on PIN_TLB
+       depends on PIN_TLB || PPC_EARLY_DEBUG_CPM
        default y
 
 config PIN_TLB_TEXT