From 4951009ea92a5edb9ec38bf9a054a600e1729cd0 Mon Sep 17 00:00:00 2001 From: Maciej Baczmanski Date: Thu, 17 Oct 2024 08:42:12 +0200 Subject: [PATCH] samples: openthread: add TF-M support for nrf54l15 add TF-M support for nrf54l15 and pull nrfxlib with changes allowing building TFM from libraries without warnings Signed-off-by: Maciej Baczmanski --- .../releases/release-notes-changelog.rst | 1 + .../boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 14 ++++++++++++++ .../boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay | 16 ++++++++++++++++ samples/openthread/cli/sample.yaml | 8 ++++++++ .../boards/nrf54l15dk_nrf54l15_cpuapp.conf | 1 - .../boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 13 +++++++++++++ .../boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay | 16 ++++++++++++++++ samples/openthread/coprocessor/sample.yaml | 4 ++++ west.yml | 2 +- 9 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf create mode 100644 samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay create mode 100644 samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf create mode 100644 samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index a8f8908b7099..c98cf3ad9098 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -668,6 +668,7 @@ Thread samples * :ref:`ot_cli_sample` sample: * Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` in the low-power snippet. + * Added experimentalupport for :ref:`Trusted Firmware-M ` on the nRF54L15 SoC. Zigbee samples -------------- diff --git a/samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf new file mode 100644 index 000000000000..b9c8f9d7923b --- /dev/null +++ b/samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -0,0 +1,14 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable the unsupported driver +CONFIG_NRFX_UARTE0=n + +# Workaround required as Zephyr L2 implies usage of NVS backend for settings. +# It should be removed once the proper fix will be applied in Zephyr. +CONFIG_NVS=n +CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS=y diff --git a/samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay b/samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay new file mode 100644 index 000000000000..fb4f0d650cca --- /dev/null +++ b/samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + + +// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(1524)>; +}; + +&cpuapp_sram { + reg = <0x20000000 DT_SIZE_K(256)>; + ranges = <0x0 0x20000000 0x40000>; +}; diff --git a/samples/openthread/cli/sample.yaml b/samples/openthread/cli/sample.yaml index 7d8c2220b44a..d84a64475d99 100644 --- a/samples/openthread/cli/sample.yaml +++ b/samples/openthread/cli/sample.yaml @@ -14,6 +14,7 @@ tests: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15dk/nrf54l15/cpuapp + nrf54l15dk/nrf54l15/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp integration_platforms: - nrf52840dk/nrf52840 @@ -22,6 +23,7 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54h20dk/nrf54h20/cpuapp sample.openthread.cli.multiprotocol: sysbuild: true @@ -34,6 +36,7 @@ tests: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15dk/nrf54l15/cpuapp + nrf54l15dk/nrf54l15/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp extra_args: > cli_SNIPPET="ci;logging;multiprotocol;tcp" @@ -45,6 +48,7 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54h20dk/nrf54h20/cpuapp sample.openthread.cli.singleprotocol: sysbuild: true @@ -56,6 +60,7 @@ tests: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15dk/nrf54l15/cpuapp + nrf54l15dk/nrf54l15/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp extra_args: > cli_SNIPPET="ci;logging;tcp" @@ -65,6 +70,7 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54h20dk/nrf54h20/cpuapp sample.openthread.cli.usb: sysbuild: true @@ -119,6 +125,7 @@ tests: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15dk/nrf54l15/cpuapp + nrf54l15dk/nrf54l15/cpuapp/ns extra_args: > cli_SNIPPET="ci;tcat;tcp" FILE_SUFFIX=ble @@ -128,3 +135,4 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l15/cpuapp/ns diff --git a/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp.conf index f4a72c04dba7..853052ea2878 100644 --- a/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -4,7 +4,6 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -CONFIG_FPU=n CONFIG_SPI_NOR=n # Workaround required as Zephyr L2 implies usage of NVS backend for settings. diff --git a/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf new file mode 100644 index 000000000000..853052ea2878 --- /dev/null +++ b/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -0,0 +1,13 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_SPI_NOR=n + +# Workaround required as Zephyr L2 implies usage of NVS backend for settings. +# It should be removed once the proper fix will be applied in Zephyr. +CONFIG_NVS=n +CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS=y diff --git a/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay b/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay new file mode 100644 index 000000000000..fb4f0d650cca --- /dev/null +++ b/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + + +// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(1524)>; +}; + +&cpuapp_sram { + reg = <0x20000000 DT_SIZE_K(256)>; + ranges = <0x0 0x20000000 0x40000>; +}; diff --git a/samples/openthread/coprocessor/sample.yaml b/samples/openthread/coprocessor/sample.yaml index 49295869f98c..dca5ca69b8e5 100644 --- a/samples/openthread/coprocessor/sample.yaml +++ b/samples/openthread/coprocessor/sample.yaml @@ -13,12 +13,14 @@ tests: nrf52840dongle/nrf52840 nrf21540dk/nrf52840 nrf54l15dk/nrf54l15/cpuapp + nrf54l15dk/nrf54l15/cpuapp/ns integration_platforms: - nrf52833dk/nrf52833 - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf52840dongle/nrf52840 - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l15/cpuapp/ns sample.openthread.coprocessor.vendor_hook: sysbuild: true build_only: true @@ -29,6 +31,7 @@ tests: nrf52840dongle/nrf52840 nrf21540dk/nrf52840 nrf54l15dk/nrf54l15/cpuapp + nrf54l15dk/nrf54l15/cpuapp/ns extra_args: > SNIPPET="ci;logging;vendor_hook" integration_platforms: @@ -37,6 +40,7 @@ tests: - nrf21540dk/nrf52840 - nrf52840dongle/nrf52840 - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l15/cpuapp/ns sample.openthread.coprocessor.usb: sysbuild: true build_only: true diff --git a/west.yml b/west.yml index 3b4e108dcf23..62a59d4d6bc0 100644 --- a/west.yml +++ b/west.yml @@ -149,7 +149,7 @@ manifest: - name: nrfxlib repo-path: sdk-nrfxlib path: nrfxlib - revision: ea7d680ce61310fa6198a23c7daf09369e5215aa + revision: pull/1521/head - name: trusted-firmware-m repo-path: sdk-trusted-firmware-m path: modules/tee/tf-m/trusted-firmware-m