[PATCH 1/2] RISC-V: configs: enable CONFIG_DEEP_PROBE_DEFAULT

[PATCH 1/2] RISC-V: configs: enable CONFIG_DEEP_PROBE_DEFAULT

[Ahmad Fatoum]

Like multi_v8_defconfig already does, default to deep probe in the
qemu virt and LiteX configurations for boards that neither opt in via
BAREBOX_DEEP_PROBE_ENABLE() nor opt out via barebox,disable-deep-probe
in their device tree.

Assisted-by: Claude:fable-5
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/riscv/configs/litex_linux_defconfig | 1 +
 arch/riscv/configs/rv64i_defconfig       | 1 +
 arch/riscv/configs/virt32_defconfig      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/arch/riscv/configs/litex_linux_defconfig b/arch/riscv/configs/litex_linux_defconfig
index e96086a87acd..fce102aaaf1d 100644
--- a/arch/riscv/configs/litex_linux_defconfig
+++ b/arch/riscv/configs/litex_linux_defconfig
@@ -46,6 +46,7 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_NET=y
 CONFIG_NET_NETCONSOLE=y
+CONFIG_DEEP_PROBE_DEFAULT=y
 CONFIG_DRIVER_NET_LITEETH=y
 CONFIG_AR8327N_PHY=y
 CONFIG_AT803X_PHY=y
diff --git a/arch/riscv/configs/rv64i_defconfig b/arch/riscv/configs/rv64i_defconfig
index 89960dd317e0..cdcee800386c 100644
--- a/arch/riscv/configs/rv64i_defconfig
+++ b/arch/riscv/configs/rv64i_defconfig
@@ -121,6 +121,7 @@ CONFIG_NET_NETCONSOLE=y
 CONFIG_NET_FASTBOOT=y
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
+CONFIG_DEEP_PROBE_DEFAULT=y
 CONFIG_OF_BAREBOX_DRIVERS=y
 CONFIG_OF_BAREBOX_ENV_IN_FS=y
 CONFIG_DRIVER_SERIAL_NS16550=y
diff --git a/arch/riscv/configs/virt32_defconfig b/arch/riscv/configs/virt32_defconfig
index 982704df6837..80359bf52d5c 100644
--- a/arch/riscv/configs/virt32_defconfig
+++ b/arch/riscv/configs/virt32_defconfig
@@ -110,6 +110,7 @@ CONFIG_NET_NETCONSOLE=y
 CONFIG_NET_FASTBOOT=y
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
+CONFIG_DEEP_PROBE_DEFAULT=y
 CONFIG_OF_BAREBOX_DRIVERS=y
 CONFIG_OF_BAREBOX_ENV_IN_FS=y
 CONFIG_DRIVER_SERIAL_NS16550=y
-- 
2.47.3

[PATCH 2/2] RISC-V: reloc: ignore R_RISCV_NONE relocations

[Ahmad Fatoum]

When linking a position independent executable, the linker may reserve
a dynamic relocation slot for a reference to an absolute symbol and only
later determine that no runtime relocation is needed. The slot is not
removed, but turned into an R_RISCV_NONE entry, which must be ignored.

Assisted-by: Claude:fable-5
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/riscv/lib/reloc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/riscv/lib/reloc.c b/arch/riscv/lib/reloc.c
index 71d59d4ab62e..99dde7bfffe2 100644
--- a/arch/riscv/lib/reloc.c
+++ b/arch/riscv/lib/reloc.c
@@ -45,6 +45,8 @@ static void relocate_image(unsigned long offset,
 		fixup = (unsigned long *)(rela->r_offset + offset);
 
 		switch (RISC_R_TYPE(rela->r_info)) {
+		case R_RISCV_NONE:
+			break;
 		case R_RISCV_RELATIVE:
 			*fixup = rela->r_addend + offset;
 			break;
-- 
2.47.3

Re: [PATCH 1/2] RISC-V: configs: enable CONFIG_DEEP_PROBE_DEFAULT

[Sascha Hauer]

On Wed, 26 Aug 2026 11:29:24 +0200, Ahmad Fatoum wrote:
> Like multi_v8_defconfig already does, default to deep probe in the
> qemu virt and LiteX configurations for boards that neither opt in via
> BAREBOX_DEEP_PROBE_ENABLE() nor opt out via barebox,disable-deep-probe
> in their device tree.
> 
> 

Applied, thanks!

[1/2] RISC-V: configs: enable CONFIG_DEEP_PROBE_DEFAULT
      https://git.pengutronix.de/cgit/barebox/commit/?id=baf086ec5d78 (link may not be stable)
[2/2] RISC-V: reloc: ignore R_RISCV_NONE relocations
      https://git.pengutronix.de/cgit/barebox/commit/?id=329dda00a207 (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>