From 2d6f5472dc3346f741eaa0eeccfdec4e052ce24e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Tue, 9 Dec 2025 14:35:10 +0100 Subject: [PATCH] [nrf fromlist] boards: nordic: nrf54h20dk: Add workaround for RISC-V debugging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add workaround that enables `west debug` and `west attach` on nrf54h20dk/nrf54h20/cpuppr and cpuflpr. Remove "-if SW" as this generates warning WARNING: runners.jlink: "f SW" does not match any known pattern And breaks JLinkGDBServer command by setting option `-select` to `usb=f SW`. Upstream PR #: 100744 Signed-off-by: Sebastian Głąb --- boards/nordic/nrf54h20dk/board.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/nordic/nrf54h20dk/board.cmake b/boards/nordic/nrf54h20dk/board.cmake index b9383042b0c7..32d467f31483 100644 --- a/boards/nordic/nrf54h20dk/board.cmake +++ b/boards/nordic/nrf54h20dk/board.cmake @@ -20,6 +20,6 @@ if(CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUPPR OR CONFIG_BOARD_NRF54H20DK_NRF54H20_C set(JLINKSCRIPTFILE ${CMAKE_CURRENT_LIST_DIR}/support/nrf54h20_cpuflpr.JLinkScript) endif() - board_runner_args(jlink "--device=RISC-V" "--speed=4000" "-if SW" "--tool-opt=-jlinkscriptfile ${JLINKSCRIPTFILE}") + board_runner_args(jlink "--device=nRF54L15_RV32" "--speed=4000" "--tool-opt=-jlinkscriptfile ${JLINKSCRIPTFILE}") include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) endif()