Merge remote-tracking branch 'torvalds/master' into perf/core

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

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 8fcceb8..4f7b70a 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -492,10 +492,16 @@ config CC_HAVE_STACKPROTECTOR_TLS
 
 config STACKPROTECTOR_PER_TASK
        def_bool y
 
 config STACKPROTECTOR_PER_TASK
        def_bool y

+       depends on !GCC_PLUGIN_RANDSTRUCT

        depends on STACKPROTECTOR && CC_HAVE_STACKPROTECTOR_TLS
 
        depends on STACKPROTECTOR && CC_HAVE_STACKPROTECTOR_TLS
 

+config PHYS_RAM_BASE_FIXED
+       bool "Explicitly specified physical RAM address"
+       default n
+

 config PHYS_RAM_BASE
        hex "Platform Physical RAM address"
 config PHYS_RAM_BASE
        hex "Platform Physical RAM address"

+       depends on PHYS_RAM_BASE_FIXED

        default "0x80000000"
        help
          This is the physical address of RAM in the system. It has to be
        default "0x80000000"
        help
          This is the physical address of RAM in the system. It has to be


@@ -508,6 +514,7 @@ config XIP_KERNEL
        # This prevents XIP from being enabled by all{yes,mod}config, which
        # fail to build since XIP doesn't support large kernels.
        depends on !COMPILE_TEST
        # This prevents XIP from being enabled by all{yes,mod}config, which
        # fail to build since XIP doesn't support large kernels.
        depends on !COMPILE_TEST

+       select PHYS_RAM_BASE_FIXED

        help
          Execute-In-Place allows the kernel to run from non-volatile storage
          directly addressable by the CPU, such as NOR flash. This saves RAM
        help
          Execute-In-Place allows the kernel to run from non-volatile storage
          directly addressable by the CPU, such as NOR flash. This saves RAM