diff options
| author | Palmer Dabbelt <palmerdabbelt@google.com> | 2021-06-30 21:50:32 -0700 |
|---|---|---|
| committer | Palmer Dabbelt <palmerdabbelt@google.com> | 2021-06-30 21:50:32 -0700 |
| commit | 01112e5e20f5298a81639806cd0a3c587aade467 (patch) | |
| tree | b453c32b2e3a8905da331a81ad234c17b62cb9dc /arch/riscv/Kconfig | |
| parent | 47513f243b452a5e21180dcf3d6ac1c57e1781a6 (diff) | |
| parent | e5c35fa0401971701dcd7675f471b664698244dd (diff) | |
| download | linux-01112e5e20f5298a81639806cd0a3c587aade467.tar.gz | |
Merge branch 'riscv-wx-mappings' into for-next
This contains both the short-term fix for the W+X boot mappings and the
larger cleanup.
* riscv-wx-mappings:
riscv: Map the kernel with correct permissions the first time
riscv: Introduce set_kernel_memory helper
riscv: Simplify xip and !xip kernel address conversion macros
riscv: Remove CONFIG_PHYS_RAM_BASE_FIXED
riscv: mm: Fix W+X mappings at boot
Diffstat (limited to 'arch/riscv/Kconfig')
| -rw-r--r-- | arch/riscv/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 9ff363306237..7304278dbbe9 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -494,13 +494,8 @@ config STACKPROTECTOR_PER_TASK def_bool y 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" - depends on PHYS_RAM_BASE_FIXED default "0x80000000" help This is the physical address of RAM in the system. It has to be @@ -513,7 +508,6 @@ 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 - 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 |