samples: net: Remove PM from networking samples for Wi-Fi targets#28547
Conversation
CI InformationTo view the history of this post, click the 'edited' button above Inputs:Sources:sdk-nrf: PR head: ca01b417a4c0974a610811d7a2a558a07f2c5671 more detailssdk-nrf:
Github labels
List of changed files detected by CI (70)Outputs:ToolchainVersion: f0aa129f09 Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped;
|
|
You can find the documentation preview for this PR here. Preview links for modified nRF Connect SDK documents: |
7b27054 to
49decd8
Compare
e60a6a7 to
d786015
Compare
|
All samples start (including nRF54LM after nrfconnect/sdk-zephyr#4042): net_wifi_hw.log. Wi-Fi transport failures are because I don't have this variant on my desk, though if it is starts, then partitions layout is correct. |
| Networking samples | ||
| ------------------ | ||
|
|
||
| * :ref:`mqtt_sample` sample: |
There was a problem hiding this comment.
Maybe something like:
-
Removed Partition Manager for all Wi-Fi targets from the following samples:
- :ref:
mqtt_sample - ...
- :ref:
And at the end of the list: Flash and SRAM partitions are supplied using the device tree overlays.
c4b4cab to
17d2865
Compare
nordicjm
left a comment
There was a problem hiding this comment.
apply comments throughout whole PR (they have been pointed out once only)
| # CONFIG_SRAM_BASE_ADDRESS / CONFIG_SRAM_SIZE override the Zephyr defaults so the | ||
| # NS application linker map matches this sample's board *.overlay (chosen zephyr,sram | ||
| # resolves to &sram0_ns_app). TF-M occupies the low 48 KiB (0xc000) of cpuapp SRAM; the NS | ||
| # image therefore starts at 0x20000000 + 0xc000 == 0x2000c000. CONFIG_SRAM_SIZE is in kB | ||
| # (see arch/Kconfig): 400 = 0x64000 bytes, the reg size of sram0_ns_app in the overlay. | ||
| # The NS window (&sram0_ns) spans 0x74000; the top 0x10000 (64 KiB) is sram0_shared for | ||
| # application/network-core IPC (nrf5340_shared_sram_partition.dtsi), so 0x64000 + 0x10000 == 0x74000. | ||
| CONFIG_SRAM_BASE_ADDRESS=0x2000c000 | ||
| CONFIG_SRAM_SIZE=400 |
There was a problem hiding this comment.
these Kconfigs should absolutely not be used, change the dts node
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
|
|
There was a problem hiding this comment.
| #address-cells = <1>; | |
| #size-cells = <1>; |
There was a problem hiding this comment.
If I understand your comment correctly, this is added by pm_to_dts.py script. This should be fixed this in the script first:
Lines 297 to 298 in b6b0de2
Same for #28547 (comment)
| reg = <0x0 DT_SIZE_K(1524)>; | ||
|
|
There was a problem hiding this comment.
| reg = <0x0 DT_SIZE_K(1524)>; |
There was a problem hiding this comment.
This is needed because FLPR memory is dropped.
There was a problem hiding this comment.
There was a problem hiding this comment.
why are you deleting nodes that do not exist? I suggest you configure hello world for nrf54l15dk/nrf54l15/cpuapp and look at the generated zephyr.dts file to compare against
There was a problem hiding this comment.
I'm not deleting them, they were before my PR, please look at main branch:
Since this change was here before, I will not address this comment in this PR.
There was a problem hiding this comment.
this should have been removed as part of the upmerge, so it was wrong then, why was it not addressed at the time and why has it still not been addressed now? Deleting a node that does not exist is invalid, @kylebonnici
There was a problem hiding this comment.
Removed just to move this forward
67c4ffc to
424f81e
Compare
|
|
||
| partitions { | ||
| compatible = "fixed-partitions"; | ||
| ranges; |
|
|
||
| partitions { | ||
| compatible = "fixed-partitions"; | ||
| ranges; |
|
|
||
| partitions { | ||
| compatible = "fixed-partitions"; | ||
| ranges; |
There was a problem hiding this comment.
| ranges; |
fix in whole PR, fixed-partitions does not use ranges, mapped partitions do
Set PARTITION_MANAGER default to n in Kconfig.sysbuild. Add board overlays with mapped partitions and SRAM sizing for nrf5340dk/nrf7002 NS, nRF54L15, nRF54LM20 A/B (cpuapp), and nrf7002dk NS so builds match the former PM layout without generated partitions.yml. Remove CONFIG_PM_PARTITION_SIZE_TFM* from NS board .conf files and set CONFIG_SRAM_BASE_ADDRESS / CONFIG_SRAM_SIZE from the overlay. Document in the NCS release changelog. Co-authored-by: Cursor <cursoragent@cursor.com> Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Default PARTITION_MANAGER off in sysbuild; nrf5340dk + nrf7002 NS overlays, nRF54L15 and nRF54LM20 A/B cpuapp overlays, nrf7002dk NS overlay and .conf cleanup (drop PM TF-M size Kconfigs, SRAM from DTS). Changelog entry. Co-authored-by: Cursor <cursoragent@cursor.com> Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Disable sysbuild PM by default; add static partition and SRAM overlays for nrf5340dk/nrf7002 NS, nRF54L15, nRF54LM20 A/B, and nrf7002dk NS; align NS .conf with overlay-based TF-M SRAM. Changelog entry. Co-authored-by: Cursor <cursoragent@cursor.com> Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Kconfig.sysbuild PM default n; board overlays for nrf5340dk/nrf7002 NS, nRF54L15, nRF54LM20 A/B, nrf7002dk NS; remove redundant CONFIG_PM_* TF-M partition lines from NS .conf and set SRAM layout from DTS. Changelog entry. Co-authored-by: Cursor <cursoragent@cursor.com> Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Kconfig.sysbuild PM default n; static flash/SRAM overlays for nrf5340dk/nrf7002 NS, nRF54L15, nRF54LM20 A/B, nrf7002dk NS; NS .conf aligned with overlays. Changelog entry. Co-authored-by: Cursor <cursoragent@cursor.com> Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
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>
Kconfig.sysbuild PM default n; nrf7002dk NS overlay and .conf for DTS-based TF-M partitions and SRAM; nRF54L15 and nRF54LM20 A/B cpuapp overlays; adjust sysbuild MCUboot image Kconfig and add nrf7002dk MCUboot overlay for the PM-disabled flash map. Changelog entry. Co-authored-by: Cursor <cursoragent@cursor.com> Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Kconfig.sysbuild PM default n. nrf7002dk NS overlay and .conf for static partitions and SRAM; nrf54lm20dk A/B NS overlays (image-1 on external flash, image-0 on RRAM) and drop redundant NS .conf lines; nrf7002dk and nrf54lm20dk MCUboot board snippets for external flash / partition alignment. Changelog entry. Co-authored-by: Cursor <cursoragent@cursor.com> Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Add a note about Partition Manager removal in networking samples for Wi-Fi targets. Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
This commit removes the unnecessary FLPR core memory removal from nRF54L15DK overlays since FLPR core is not included. Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
36f5d9e to
ca01b41
Compare
|
@nrfconnect/ncs-cia please have a look |
This PR removes Partition Manager from the networking samples on the Wi‑Fi nRF5340, nRF54L15, nRF54LM20 targets, and moves the flash and RAM layout into Devicetree.
Tha code and RAM partitions layout is aligned with Partition Manager layouts.
nRF91 and Thingy91(x) builds are left on Partition Manager.
Jira: NCSDK-39198