From ce4a3cd4c26b1c0f5b1ddef114fc8d7acf7176f7 Mon Sep 17 00:00:00 2001 From: Markus Lassila Date: Wed, 3 Jun 2026 12:10:04 +0300 Subject: [PATCH 1/2] app: Fix overlay-pgps.overlay and overlay-memfault.overlay Additional partition needs to be inside storage_partition so that TF-M sets it non-secure. Signed-off-by: Markus Lassila --- app/overlay-memfault.overlay | 22 ++++++++++++++++++---- app/overlay-pgps.overlay | 22 ++++++++++++++++++---- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/app/overlay-memfault.overlay b/app/overlay-memfault.overlay index 2a4324a8..2a67f3ea 100644 --- a/app/overlay-memfault.overlay +++ b/app/overlay-memfault.overlay @@ -9,11 +9,13 @@ / { chosen { nordic,memfault-coredump-partition = &memfault_coredump_partition; + zephyr,settings_partition = &settings_storage_partition; }; }; /delete-node/ &slot0_partition; /delete-node/ &slot1_partition; +/delete-node/ &storage_partition; &flash0 { partitions { @@ -63,13 +65,25 @@ }; }; - memfault_coredump_partition: partition@f9000 { + storage_partition: partition@f9000 { compatible = "zephyr,mapped-partition"; - label = "memfault_coredump_partition"; - reg = <0xf9000 0x4000>; - ranges = <0x0 0xf9000 0x4000>; + label = "storage"; + reg = <0xf9000 0x7000>; + ranges = <0x0 0xf9000 0x7000>; #address-cells = <1>; #size-cells = <1>; + + memfault_coredump_partition: partition@0 { + compatible = "zephyr,mapped-partition"; + label = "memfault_coredump_partition"; + reg = <0x0 0x4000>; + }; + + settings_storage_partition: partition@4000 { + compatible = "zephyr,mapped-partition"; + label = "settings-storage"; + reg = <0x4000 0x3000>; + }; }; }; }; diff --git a/app/overlay-pgps.overlay b/app/overlay-pgps.overlay index 43f6b8c6..82ca9646 100644 --- a/app/overlay-pgps.overlay +++ b/app/overlay-pgps.overlay @@ -9,11 +9,13 @@ / { chosen { nordic,pgps_partition = &pgps_partition; + zephyr,settings_partition = &settings_storage_partition; }; }; /delete-node/ &slot0_partition; /delete-node/ &slot1_partition; +/delete-node/ &storage_partition; &flash0 { partitions { @@ -63,13 +65,25 @@ }; }; - pgps_partition: partition@e9000 { + storage_partition: partition@e9000 { compatible = "zephyr,mapped-partition"; - label = "pgps"; - reg = <0xe9000 0x14000>; - ranges = <0x0 0xe9000 0x14000>; + label = "storage"; + reg = <0x000e9000 0x17000>; + ranges = <0x0 0x000e9000 0x17000>; #address-cells = <1>; #size-cells = <1>; + + pgps_partition: partition@0 { + compatible = "zephyr,mapped-partition"; + label = "pgps"; + reg = <0x00000000 0x14000>; + }; + + settings_storage_partition: partition@14000 { + compatible = "zephyr,mapped-partition"; + label = "settings-storage"; + reg = <0x000014000 0x3000>; + }; }; }; }; From 1239702cb6f436423c8440186768753707b881e0 Mon Sep 17 00:00:00 2001 From: Markus Lassila Date: Wed, 3 Jun 2026 13:04:32 +0300 Subject: [PATCH 2/2] app: Fix DTS for Thingy:91x - Add missing b0 and mcuboot overlays - Set the secure size correctly for overlay-trace-backend.overlay - Disable carrier for Thingy:91x. It would need it's own overlay as the storage_partition is in external flash. Signed-off-by: Markus Lassila --- app/overlay-trace-backend.overlay | 5 +++++ app/sample.yaml | 1 - .../b0/boards/thingy91x_nrf9151.overlay | 17 +++++++++++++++++ .../mcuboot/boards/thingy91x_nrf9151.overlay | 17 +++++++++++++++-- 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 app/sysbuild/b0/boards/thingy91x_nrf9151.overlay diff --git a/app/overlay-trace-backend.overlay b/app/overlay-trace-backend.overlay index b307b9d8..ad6938a4 100644 --- a/app/overlay-trace-backend.overlay +++ b/app/overlay-trace-backend.overlay @@ -17,10 +17,15 @@ * 0x2000_c800 Application RAM ( 206 kB) */ +/delete-node/ &sram0_s; /delete-node/ &sram0_ns; &sram0 { + sram0_s: sram@0 { + reg = <0x0 0x4000>; + }; + sram0_ns: sram@4000 { reg = <0x4000 0x3c000>; #address-cells = <1>; diff --git a/app/sample.yaml b/app/sample.yaml index 4b04018b..91c1351f 100644 --- a/app/sample.yaml +++ b/app/sample.yaml @@ -159,7 +159,6 @@ tests: - EXTRA_DTC_OVERLAY_FILE="overlay-carrier.overlay" platform_allow: - nrf9151dk/nrf9151/ns - - thingy91x/nrf9151/ns integration_platforms: - nrf9151dk/nrf9151/ns serial_modem.lwm2m_carrier.softbank: diff --git a/app/sysbuild/b0/boards/thingy91x_nrf9151.overlay b/app/sysbuild/b0/boards/thingy91x_nrf9151.overlay new file mode 100644 index 00000000..6de56c8f --- /dev/null +++ b/app/sysbuild/b0/boards/thingy91x_nrf9151.overlay @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &b0_partition; + zephyr,console = &uart1; + }; +}; + +&uart1 { + current-speed = <1000000>; + status = "okay"; +}; diff --git a/app/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay b/app/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay index 7f2818c0..0ca8f251 100644 --- a/app/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay +++ b/app/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay @@ -1,4 +1,17 @@ -&uart0 { +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &s0_partition; + zephyr,console = &uart1; + }; +}; + +&uart1 { + current-speed = <1000000>; status = "okay"; - current-speed = < 1000000 >; };