Skip to content

Commit 867432b

Browse files
AlexGhitipalmer-dabbelt
authored andcommitted
Revert "riscv: Remove CONFIG_PHYS_RAM_BASE_FIXED"
This reverts commit 9b79878. The removal of this config exposes CONFIG_PHYS_RAM_BASE for all kernel types: this value being implementation-specific, this breaks the genericity of the RISC-V kernel so revert it. Signed-off-by: Alexandre Ghiti <[email protected]> Tested-by: Emil Renner Berthing <[email protected]> Reviewed-by: Jisheng Zhang <[email protected]> Cc: [email protected] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent 6d7f91d commit 867432b

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

arch/riscv/Kconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,13 @@ config STACKPROTECTOR_PER_TASK
495495
depends on !GCC_PLUGIN_RANDSTRUCT
496496
depends on STACKPROTECTOR && CC_HAVE_STACKPROTECTOR_TLS
497497

498+
config PHYS_RAM_BASE_FIXED
499+
bool "Explicitly specified physical RAM address"
500+
default n
501+
498502
config PHYS_RAM_BASE
499503
hex "Platform Physical RAM address"
504+
depends on PHYS_RAM_BASE_FIXED
500505
default "0x80000000"
501506
help
502507
This is the physical address of RAM in the system. It has to be
@@ -509,6 +514,7 @@ config XIP_KERNEL
509514
# This prevents XIP from being enabled by all{yes,mod}config, which
510515
# fail to build since XIP doesn't support large kernels.
511516
depends on !COMPILE_TEST
517+
select PHYS_RAM_BASE_FIXED
512518
help
513519
Execute-In-Place allows the kernel to run from non-volatile storage
514520
directly addressable by the CPU, such as NOR flash. This saves RAM

0 commit comments

Comments
 (0)