arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common

[platform/kernel/linux-rpi.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a9c4e48..8c88c8a 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1,13 +1,17 @@
 config ARM
        bool
        default y
-       select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
+       select ARCH_CLOCKSOURCE_DATA
        select ARCH_HAS_DEVMEM_IS_ALLOWED
        select ARCH_HAS_ELF_RANDOMIZE
+       select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL
+       select ARCH_HAS_STRICT_MODULE_RWX if MMU
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
        select ARCH_HAVE_CUSTOM_GPIO_H
        select ARCH_HAS_GCOV_PROFILE_ALL
        select ARCH_MIGHT_HAVE_PC_PARPORT
+       select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
+       select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7
        select ARCH_SUPPORTS_ATOMIC_RMW
        select ARCH_USE_BUILTIN_BSWAP
        select ARCH_USE_CMPXCHG_LOCKREF
@@ -278,10 +282,9 @@ config PHYS_OFFSET
                        ARCH_INTEGRATOR || \
                        ARCH_IOP13XX || \
                        ARCH_KS8695 || \
-                       (ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET)
+                       ARCH_REALVIEW
        default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
        default 0x20000000 if ARCH_S5PV210
-       default 0x70000000 if REALVIEW_HIGH_PHYS_OFFSET
        default 0xc0000000 if ARCH_SA1100
        help
          Please provide the physical address corresponding to the
@@ -337,6 +340,7 @@ config ARCH_MULTIPLATFORM
        select GENERIC_CLOCKEVENTS
        select MIGHT_HAVE_PCI
        select MULTI_IRQ_HANDLER
+       select PCI_DOMAINS if PCI
        select SPARSE_IRQ
        select USE_OF
 
@@ -703,6 +707,7 @@ config ARCH_VIRT
        select ARM_GIC
        select ARM_GIC_V2M if PCI
        select ARM_GIC_V3
+       select ARM_GIC_V3_ITS if PCI
        select ARM_PSCI
        select HAVE_ARM_ARCH_TIMER
 
@@ -878,6 +883,7 @@ config ARCH_STM32
        select CLKSRC_STM32
        select PINCTRL
        select RESET_CONTROLLER
+       select STM32_EXTI
        help
          Support for STMicroelectronics STM32 processors.
 
@@ -886,6 +892,11 @@ config MACH_STM32F429
        depends on ARCH_STM32
        default y
 
+config MACH_STM32F746
+       bool "STMicrolectronics STM32F746"
+       depends on ARCH_STM32
+       default y
+
 config ARCH_MPS2
        bool "ARM MPS2 platform"
        depends on ARM_SINGLE_ARMV7M