Skip to content

Commit d6ef6be

Browse files
PavelVPVcursoragent
PavelVPV
and
cursoragent
committed
samples: net: http_server: disable Partition Manager for Wi-Fi
Kconfig.sysbuild PM default n; overlays for nrf5340dk/nrf7002 NS, nRF54L15, nRF54LM20 A/B, nrf7002dk NS; drop PM TF-M size Kconfigs from NS .conf in favour of DTS. Changelog entry. Co-authored-by: Cursor <cursoragent@cursor.com> Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
1 parent b21f7a2 commit d6ef6be

9 files changed

Lines changed: 259 additions & 4 deletions

‎doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,10 @@ Networking samples
438438

439439
* Removed Partition Manager dependency for all Wi-Fi targets.
440440
Flash and SRAM partitions are supplied via Devicetree overlays instead.
441+
* :ref:`http_server` sample:
442+
443+
* Removed Partition Manager dependency for all Wi-Fi targets.
444+
Flash and SRAM partitions are supplied via Devicetree overlays instead.
441445

442446
* :ref:`azure_iot_hub` sample:
443447

‎samples/net/http_server/Kconfig.sysbuild‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,10 @@ config WIFI_NRF70
1212
BOARD_NRF54LM20DK_NRF54LM20A_CPUAPP || \
1313
BOARD_NRF54LM20DK_NRF54LM20B_CPUAPP
1414

15+
config PARTITION_MANAGER
16+
default n if !BOARD_NRF9160DK_NRF9160_NS && \
17+
!BOARD_NRF9161DK_NRF9161_NS && \
18+
!BOARD_NRF9151DK_NRF9151_NS && \
19+
!BOARD_THINGY91_NRF9160_NS
20+
1521
source "share/sysbuild/Kconfig"

‎samples/net/http_server/boards/nrf5340dk_nrf5340_cpuapp_ns.conf‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,16 @@
66

77
# Optimize TF-M
88
CONFIG_TFM_PROFILE_TYPE_SMALL=y
9-
CONFIG_PM_PARTITION_SIZE_TFM_SRAM=0xc000
10-
CONFIG_PM_PARTITION_SIZE_TFM=0x20000
9+
10+
# CONFIG_SRAM_BASE_ADDRESS / CONFIG_SRAM_SIZE override the Zephyr defaults so the
11+
# NS application linker map matches this sample's board *.overlay (chosen zephyr,sram
12+
# resolves to &sram0_ns_app). TF-M occupies the low 48 KiB (0xc000) of cpuapp SRAM; the NS
13+
# image therefore starts at 0x20000000 + 0xc000 == 0x2000c000. CONFIG_SRAM_SIZE is in kB
14+
# (see arch/Kconfig): 400 = 0x64000 bytes, the reg size of sram0_ns_app in the overlay.
15+
# The NS window (&sram0_ns) spans 0x74000; the top 0x10000 (64 KiB) is sram0_shared for
16+
# application/network-core IPC (nrf5340_shared_sram_partition.dtsi), so 0x64000 + 0x10000 == 0x74000.
17+
CONFIG_SRAM_BASE_ADDRESS=0x2000c000
18+
CONFIG_SRAM_SIZE=400
1119

1220
# Optimize Wi-Fi stack to save some memory
1321
CONFIG_HEAP_MEM_POOL_SIZE=40144

‎samples/net/http_server/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
/*
2+
* Copyright (c) 2026 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
/delete-node/ &boot_partition;
8+
/delete-node/ &slot0_partition;
9+
/delete-node/ &slot1_partition;
10+
/delete-node/ &tfm_its_partition;
11+
/delete-node/ &tfm_otp_partition;
12+
/delete-node/ &tfm_ps_partition;
13+
/delete-node/ &storage_partition;
14+
15+
&flash0 {
16+
partitions {
17+
slot0_s_partition: partition@0 {
18+
compatible = "zephyr,mapped-partition";
19+
label = "image-0-secure";
20+
reg = <0x0 0x20000>;
21+
};
22+
23+
slot0_ns_partition: partition@20000 {
24+
compatible = "zephyr,mapped-partition";
25+
label = "image-0-nonsecure";
26+
reg = <0x20000 0xd4000>;
27+
};
28+
29+
tfm_storage_partition: partition@f4000 {
30+
compatible = "zephyr,mapped-partition";
31+
label = "tfm-storage";
32+
reg = <0xf4000 DT_SIZE_K(48)>;
33+
ranges = <0x0 0xf4000 DT_SIZE_K(48)>;
34+
#address-cells = <1>;
35+
#size-cells = <1>;
36+
37+
tfm_its_partition: partition@0 {
38+
compatible = "zephyr,mapped-partition";
39+
label = "tfm-its";
40+
reg = <0x0 DT_SIZE_K(8)>;
41+
};
42+
43+
tfm_otp_partition: partition@4000 {
44+
compatible = "zephyr,mapped-partition";
45+
label = "tfm-otp";
46+
reg = <0x4000 DT_SIZE_K(8)>;
47+
};
48+
49+
tfm_ps_partition: partition@8000 {
50+
compatible = "zephyr,mapped-partition";
51+
label = "tfm-ps";
52+
reg = <0x8000 DT_SIZE_K(16)>;
53+
};
54+
};
55+
};
56+
};
57+
58+
/*
59+
* TrustZone SRAM split from devicetree (region_defs.h for TF-M). The secure image uses
60+
* 48 KiB (0xc000) at the base of cpuapp SRAM (&sram0_s); NS RAM begins at 0x20000000 + 0xc000.
61+
* &sram0_ns spans 0x74000 bytes; &sram0_ns_app is 0x64000 because the top 0x10000 (64 KiB)
62+
* within that NS window is sram0_shared for application/network-core IPC
63+
* (nrf5340_shared_sram_partition.dtsi), i.e. 0x64000 + 0x10000 == 0x74000.
64+
*/
65+
&sram0_s {
66+
reg = <0x0 0xc000>;
67+
};
68+
69+
&sram0_ns {
70+
reg = <0xc000 0x74000>;
71+
ranges = <0x0 0xc000 0x74000>;
72+
};
73+
74+
&sram0_ns_app {
75+
reg = <0x0 0x64000>;
76+
};

‎samples/net/http_server/boards/nrf54l15dk_nrf54l15_cpuapp.overlay‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
*/
66

7+
/delete-node/ &boot_partition;
8+
/delete-node/ &slot0_partition;
9+
/delete-node/ &slot1_partition;
10+
/delete-node/ &storage_partition;
11+
712
&rram_controller {
813
/delete-node/ cpuflpr_sram;
914
/delete-node/ cpuflpr_rram;
@@ -18,4 +23,18 @@
1823
/* Adjust the cpuapp_rram to include the freed up cpuflpr_rram */
1924
&cpuapp_rram {
2025
reg = <0x0 DT_SIZE_K(1524)>;
26+
27+
partitions {
28+
slot0_partition: partition@0 {
29+
compatible = "zephyr,mapped-partition";
30+
label = "image-0";
31+
reg = <0x0 0x17b000>;
32+
};
33+
34+
storage_partition: partition@17b000 {
35+
compatible = "zephyr,mapped-partition";
36+
label = "storage";
37+
reg = <0x17b000 0x2000>;
38+
};
39+
};
2140
};

‎samples/net/http_server/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Copyright (c) 2026 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
/delete-node/ &boot_partition;
8+
/delete-node/ &slot0_partition;
9+
/delete-node/ &slot1_partition;
10+
/delete-node/ &storage_partition;
11+
12+
&cpuapp_rram {
13+
partitions {
14+
#address-cells = <1>;
15+
#size-cells = <1>;
16+
17+
slot0_partition: partition@0 {
18+
compatible = "zephyr,mapped-partition";
19+
label = "image-0";
20+
reg = <0x0 0x1fb000>;
21+
};
22+
23+
storage_partition: partition@1fb000 {
24+
compatible = "zephyr,mapped-partition";
25+
label = "storage";
26+
reg = <0x1fb000 0x2000>;
27+
};
28+
};
29+
};

‎samples/net/http_server/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Copyright (c) 2026 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
/delete-node/ &boot_partition;
8+
/delete-node/ &slot0_partition;
9+
/delete-node/ &slot1_partition;
10+
/delete-node/ &storage_partition;
11+
12+
&cpuapp_rram {
13+
partitions {
14+
#address-cells = <1>;
15+
#size-cells = <1>;
16+
17+
slot0_partition: partition@0 {
18+
compatible = "zephyr,mapped-partition";
19+
label = "image-0";
20+
reg = <0x0 0x1fb000>;
21+
};
22+
23+
storage_partition: partition@1fb000 {
24+
compatible = "zephyr,mapped-partition";
25+
label = "storage";
26+
reg = <0x1fb000 0x2000>;
27+
};
28+
};
29+
};

‎samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.conf‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,16 @@
66

77
# Optimize TF-M
88
CONFIG_TFM_PROFILE_TYPE_SMALL=y
9-
CONFIG_PM_PARTITION_SIZE_TFM_SRAM=0xc000
10-
CONFIG_PM_PARTITION_SIZE_TFM=0x20000
9+
10+
# CONFIG_SRAM_BASE_ADDRESS / CONFIG_SRAM_SIZE override the Zephyr defaults so the
11+
# NS application linker map matches this sample's board *.overlay (chosen zephyr,sram
12+
# resolves to &sram0_ns_app). TF-M occupies the low 48 KiB (0xc000) of cpuapp SRAM; the NS
13+
# image therefore starts at 0x20000000 + 0xc000 == 0x2000c000. CONFIG_SRAM_SIZE is in kB
14+
# (see arch/Kconfig): 400 = 0x64000 bytes, the reg size of sram0_ns_app in the overlay.
15+
# The NS window (&sram0_ns) spans 0x74000; the top 0x10000 (64 KiB) is sram0_shared for
16+
# application/network-core IPC (nrf5340_shared_sram_partition.dtsi), so 0x64000 + 0x10000 == 0x74000.
17+
CONFIG_SRAM_BASE_ADDRESS=0x2000c000
18+
CONFIG_SRAM_SIZE=400
1119

1220
# Optimize Wi-Fi stack to save some memory
1321
CONFIG_HEAP_MEM_POOL_SIZE=40144

‎samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.overlay‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
/*
2+
* Copyright (c) 2026 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
/delete-node/ &boot_partition;
8+
/delete-node/ &slot0_partition;
9+
/delete-node/ &slot1_partition;
10+
/delete-node/ &tfm_its_partition;
11+
/delete-node/ &tfm_otp_partition;
12+
/delete-node/ &tfm_ps_partition;
13+
/delete-node/ &storage_partition;
14+
15+
&flash0 {
16+
partitions {
17+
slot0_s_partition: partition@0 {
18+
compatible = "zephyr,mapped-partition";
19+
label = "image-0-secure";
20+
reg = <0x0 0x20000>;
21+
};
22+
23+
slot0_ns_partition: partition@20000 {
24+
compatible = "zephyr,mapped-partition";
25+
label = "image-0-nonsecure";
26+
reg = <0x20000 0xd4000>;
27+
};
28+
29+
tfm_storage_partition: partition@f4000 {
30+
compatible = "zephyr,mapped-partition";
31+
label = "tfm-storage";
32+
reg = <0xf4000 DT_SIZE_K(48)>;
33+
ranges = <0x0 0xf4000 DT_SIZE_K(48)>;
34+
#address-cells = <1>;
35+
#size-cells = <1>;
36+
37+
tfm_its_partition: partition@0 {
38+
compatible = "zephyr,mapped-partition";
39+
label = "tfm-its";
40+
reg = <0x0 DT_SIZE_K(8)>;
41+
};
42+
43+
tfm_otp_partition: partition@4000 {
44+
compatible = "zephyr,mapped-partition";
45+
label = "tfm-otp";
46+
reg = <0x4000 DT_SIZE_K(8)>;
47+
};
48+
49+
tfm_ps_partition: partition@8000 {
50+
compatible = "zephyr,mapped-partition";
51+
label = "tfm-ps";
52+
reg = <0x8000 DT_SIZE_K(16)>;
53+
};
54+
};
55+
};
56+
};
57+
58+
/*
59+
* TrustZone SRAM split from devicetree (region_defs.h for TF-M). The secure image uses
60+
* 48 KiB (0xc000) at the base of cpuapp SRAM (&sram0_s); NS RAM begins at 0x20000000 + 0xc000.
61+
* &sram0_ns spans 0x74000 bytes; &sram0_ns_app is 0x64000 because the top 0x10000 (64 KiB)
62+
* within that NS window is sram0_shared for application/network-core IPC
63+
* (nrf5340_shared_sram_partition.dtsi), i.e. 0x64000 + 0x10000 == 0x74000.
64+
*/
65+
&sram0_s {
66+
reg = <0x0 0xc000>;
67+
};
68+
69+
&sram0_ns {
70+
reg = <0xc000 0x74000>;
71+
ranges = <0x0 0xc000 0x74000>;
72+
};
73+
74+
&sram0_ns_app {
75+
reg = <0x0 0x64000>;
76+
};

0 commit comments

Comments
 (0)