Unverified Commit 867432be authored by Alexandre Ghiti's avatar Alexandre Ghiti Committed by Palmer Dabbelt
Browse files

Revert "riscv: Remove CONFIG_PHYS_RAM_BASE_FIXED" 



This reverts commit 9b79878c.

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: default avatarAlexandre Ghiti <alex@ghiti.fr>
Tested-by: default avatarEmil Renner Berthing <kernel@esmil.dk>
Reviewed-by: default avatarJisheng Zhang <jszhang@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 6d7f91d9

arch/riscv/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -495,8 +495,13 @@ config STACKPROTECTOR_PER_TASK 
	depends on !GCC_PLUGIN_RANDSTRUCT

	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
@@ -509,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

	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