From fdbe4bf4ec644f6f31ae4180865a0384219cb80e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Thu, 25 Sep 2025 14:31:31 +0200 Subject: [PATCH 1/4] [nrf fromtree] tests: drivers: spi: spi_loopback: Run test on nrf54h20 PPR XIP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The spi_loopback test requires more RAM than is avilable on nrf54h20dk/nrf54h20/cpuppr target. Meanwhile, test fits in Execute In Place (XIP) variant of the PPR target. Switch spi_loopback test to nrf54h20 PPR XIP target. Signed-off-by: Sebastian Głąb (cherry picked from commit 6d76a71fa2590259dfbc68f9ec0e21438e2fb92e) --- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 11 ----------- .../boards/nrf54h20dk_nrf54h20_cpuppr.conf | 1 - .../boards/nrf54h20dk_nrf54h20_cpuppr_xip.conf | 2 ++ ...overlay => nrf54h20dk_nrf54h20_cpuppr_xip.overlay} | 2 +- 4 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr.conf create mode 100644 tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr_xip.conf rename tests/drivers/spi/spi_loopback/boards/{nrf54h20dk_nrf54h20_cpuppr.overlay => nrf54h20dk_nrf54h20_cpuppr_xip.overlay} (66%) diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 17c2909717f..aa5dc30239c 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -7,15 +7,4 @@ &spi130 { memory-regions = <&cpuapp_dma_region>; - zephyr,pm-device-runtime-auto; - slow@0 { - compatible = "test-spi-loopback-slow"; - reg = <0>; - spi-max-frequency = ; - }; - fast@0 { - compatible = "test-spi-loopback-fast"; - reg = <0>; - spi-max-frequency = ; - }; }; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr.conf b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr.conf deleted file mode 100644 index af7d7e938e0..00000000000 --- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SPI_LARGE_BUFFER_SIZE=1024 diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr_xip.conf b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr_xip.conf new file mode 100644 index 00000000000..250de8d4487 --- /dev/null +++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr_xip.conf @@ -0,0 +1,2 @@ +CONFIG_SPI_LARGE_BUFFER_SIZE=1024 +CONFIG_SPI_IDEAL_TRANSFER_DURATION_SCALING=15 diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr_xip.overlay similarity index 66% rename from tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr.overlay rename to tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr_xip.overlay index cea31612851..76ebe341037 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuppr_xip.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 */ From 708c2b04c7e1efc07a76a7f562bd25b715baca49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Fri, 26 Sep 2025 12:00:21 +0200 Subject: [PATCH 2/4] [nrf fromtree] tests: drivers: spi: spi_error_cases: Extend platform_allow list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add Radio core and PPR core on nrf54h20 DK to platform_allow list. Required overlays are already present. Signed-off-by: Sebastian Głąb (cherry picked from commit bc2c95c8f0d2bd9381316e9fc40c9ad430043842) --- tests/drivers/spi/spi_error_cases/testcase.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/drivers/spi/spi_error_cases/testcase.yaml b/tests/drivers/spi/spi_error_cases/testcase.yaml index 9ad509baddb..eb3f4c78c58 100644 --- a/tests/drivers/spi/spi_error_cases/testcase.yaml +++ b/tests/drivers/spi/spi_error_cases/testcase.yaml @@ -11,8 +11,10 @@ tests: drivers.spi.spi_error_cases: platform_allow: - nrf52840dk/nrf52840 - - nrf54l15dk/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp + - nrf54h20dk/nrf54h20/cpuppr + - nrf54h20dk/nrf54h20/cpurad + - nrf54l15dk/nrf54l15/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp - ophelia4ev/nrf54l15/cpuapp integration_platforms: From 23c1a41c752f0904910df44c57f48b36f851dc8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Fri, 26 Sep 2025 13:33:14 +0200 Subject: [PATCH 3/4] [nrf fromtree] boards: nordic: nrf54h20dk: Add SPI to supported features on PPR XIP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enable Twister tests that depend on SPI feature on nrf54h20dk/nrf54h20/cpuppr/xip target. Signed-off-by: Sebastian Głąb (cherry picked from commit ba8b36c8a1c22e60c38287ae855e9fb15ed088a9) --- .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml index 7198a379a9c..58c6473538d 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml @@ -12,3 +12,4 @@ ram: 62 flash: 64 supported: - gpio + - spi From 7854a392afee8f3e0d93f2002a5ce6111013db6a Mon Sep 17 00:00:00 2001 From: Piotr Kosycarz Date: Tue, 30 Sep 2025 12:51:06 +0200 Subject: [PATCH 4/4] [nrf fromtree] boards: nordic: nrf54h20dk: fix flashing for xip variants Make sure operations are groupped when using ppr/xip and flpr/xip. Signed-off-by: Piotr Kosycarz (cherry picked from commit e3a3fca7facfbfa1adddfc779ccc46481150c689) --- boards/nordic/nrf54h20dk/board.yml | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml index 2d3d40c20e0..1a505729f99 100644 --- a/boards/nordic/nrf54h20dk/board.yml +++ b/boards/nordic/nrf54h20dk/board.yml @@ -14,3 +14,43 @@ board: default: "0.9.0" revisions: - name: "0.9.0" +runners: + run_once: + '--recover': + - runners: + - nrfutil + run: first + groups: + - boards: + - nrf54h20dk@0.9.0/nrf54h20/cpuapp + - nrf54h20dk@0.9.0/nrf54h20/cpurad + - nrf54h20dk@0.9.0/nrf54h20/cpuppr + - nrf54h20dk@0.9.0/nrf54h20/cpuppr/xip + - nrf54h20dk@0.9.0/nrf54h20/cpuflpr + - nrf54h20dk@0.9.0/nrf54h20/cpuflpr/xip + '--erase': + - runners: + - jlink + - nrfutil + run: first + groups: + - boards: + - nrf54h20dk@0.9.0/nrf54h20/cpuapp + - nrf54h20dk@0.9.0/nrf54h20/cpurad + - nrf54h20dk@0.9.0/nrf54h20/cpuppr + - nrf54h20dk@0.9.0/nrf54h20/cpuppr/xip + - nrf54h20dk@0.9.0/nrf54h20/cpuflpr + - nrf54h20dk@0.9.0/nrf54h20/cpuflpr/xip + '--reset': + - runners: + - jlink + - nrfutil + run: last + groups: + - boards: + - nrf54h20dk@0.9.0/nrf54h20/cpuapp + - nrf54h20dk@0.9.0/nrf54h20/cpurad + - nrf54h20dk@0.9.0/nrf54h20/cpuppr + - nrf54h20dk@0.9.0/nrf54h20/cpuppr/xip + - nrf54h20dk@0.9.0/nrf54h20/cpuflpr + - nrf54h20dk@0.9.0/nrf54h20/cpuflpr/xip