From aad9f96a69712ed60b378c3463c39495125c972b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Stasiak?= Date: Thu, 20 Mar 2025 15:22:00 +0100 Subject: [PATCH] [nrf fromtree] tests: drivers: flash: extend support for nRF54L09 and nRF54L20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added missing nodes, configurations and filters in testcase.yaml. Signed-off-by: Michał Stasiak (cherry picked from commit 1e972956222ab0f4c472b78ca6c13c4628d5b1d9) --- boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi | 4 ++++ .../flash/common/boards/nrf54l09pdk_nrf54l09_cpuapp.conf | 4 ++++ .../flash/common/boards/nrf54l20pdk_nrf54l20_cpuapp.conf | 4 ++++ tests/drivers/flash/common/testcase.yaml | 1 + tests/drivers/flash/negative_tests/src/main.c | 5 +---- tests/drivers/flash/negative_tests/testcase.yaml | 1 + 6 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 tests/drivers/flash/common/boards/nrf54l09pdk_nrf54l09_cpuapp.conf create mode 100644 tests/drivers/flash/common/boards/nrf54l20pdk_nrf54l20_cpuapp.conf diff --git a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi index ed9d76a6b193..16bcd4d6f361 100644 --- a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi +++ b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi @@ -69,6 +69,10 @@ label = "image-1-nonsecure"; reg = <0x160c00 DT_SIZE_K(449)>; }; + storage_partition: partition@1d1000 { + label = "storage"; + reg = <0x1d1000 DT_SIZE_K(36)>; + }; }; }; diff --git a/tests/drivers/flash/common/boards/nrf54l09pdk_nrf54l09_cpuapp.conf b/tests/drivers/flash/common/boards/nrf54l09pdk_nrf54l09_cpuapp.conf new file mode 100644 index 000000000000..821a5e77e5b5 --- /dev/null +++ b/tests/drivers/flash/common/boards/nrf54l09pdk_nrf54l09_cpuapp.conf @@ -0,0 +1,4 @@ +CONFIG_FCB=y +CONFIG_FLASH_MAP=y +CONFIG_SETTINGS=y +CONFIG_SETTINGS_FCB=y diff --git a/tests/drivers/flash/common/boards/nrf54l20pdk_nrf54l20_cpuapp.conf b/tests/drivers/flash/common/boards/nrf54l20pdk_nrf54l20_cpuapp.conf new file mode 100644 index 000000000000..821a5e77e5b5 --- /dev/null +++ b/tests/drivers/flash/common/boards/nrf54l20pdk_nrf54l20_cpuapp.conf @@ -0,0 +1,4 @@ +CONFIG_FCB=y +CONFIG_FLASH_MAP=y +CONFIG_SETTINGS=y +CONFIG_SETTINGS_FCB=y diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml index 700c411066c3..9f847204d648 100644 --- a/tests/drivers/flash/common/testcase.yaml +++ b/tests/drivers/flash/common/testcase.yaml @@ -46,6 +46,7 @@ tests: - nrf54l09pdk/nrf54l09/cpuapp - nrf54l15dk/nrf54l10/cpuapp - nrf54l15dk/nrf54l15/cpuapp + - nrf54l20pdk/nrf54l20/cpuapp - nrf54h20dk/nrf54h20/cpuapp drivers.flash.common.tfm_ns: build_only: true diff --git a/tests/drivers/flash/negative_tests/src/main.c b/tests/drivers/flash/negative_tests/src/main.c index bd6a6557c26d..38f38f4ccf40 100644 --- a/tests/drivers/flash/negative_tests/src/main.c +++ b/tests/drivers/flash/negative_tests/src/main.c @@ -26,10 +26,7 @@ #define TEST_AREA_SIZE FIXED_PARTITION_SIZE(TEST_AREA) #define TEST_AREA_DEVICE FIXED_PARTITION_DEVICE(TEST_AREA) -#if defined(CONFIG_SOC_NRF54L05) || \ - defined(CONFIG_SOC_NRF54L09) || \ - defined(CONFIG_SOC_NRF54L10) || \ - defined(CONFIG_SOC_NRF54L15) +#if defined(CONFIG_SOC_SERIES_NRF54LX) #define TEST_FLASH_START (DT_REG_ADDR(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA)))) #define TEST_FLASH_SIZE (DT_REG_SIZE(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA)))) #elif defined(CONFIG_SOC_NRF54H20) diff --git a/tests/drivers/flash/negative_tests/testcase.yaml b/tests/drivers/flash/negative_tests/testcase.yaml index 3a795e4a2da6..11a669c981f0 100644 --- a/tests/drivers/flash/negative_tests/testcase.yaml +++ b/tests/drivers/flash/negative_tests/testcase.yaml @@ -7,4 +7,5 @@ tests: platform_allow: - nrf54l09pdk/nrf54l09/cpuapp - nrf54l15dk/nrf54l15/cpuapp + - nrf54l20pdk/nrf54l20/cpuapp - nrf54h20dk/nrf54h20/cpuapp