Skip to content

Commit afc305d

Browse files
krish2718nordicjm
authored andcommitted
snippets: nrf70-wifi: Fix 54H memory map
Redo the memory map to accommodate CPURAD slot0, this is essential for combo build. Also, apply the memory map to both CPUAPP and CPURAD to fix the memory corruption issues if they see different memory maps, rename the file to reflect the shared nature. Fix SHEL-3743. Signed-off-by: Chaitanya Tata <[email protected]>
1 parent d919393 commit afc305d

File tree

4 files changed

+51
-40
lines changed

4 files changed

+51
-40
lines changed

snippets/nrf70-wifi/nrf54h20_cpuapp.overlay

Lines changed: 0 additions & 28 deletions
This file was deleted.

snippets/nrf70-wifi/nrf54h20_cpurad.overlay

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/*
2+
* Copyright (c) 2025 Nordic Semiconductor
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
/* Redo the Flash partitions */
8+
&mram1x {
9+
/delete-node/ partitions;
10+
11+
partitions {
12+
compatible = "fixed-partitions";
13+
#address-cells = <1>;
14+
#size-cells = <1>;
15+
16+
cpuapp_boot_partition: partition@30000 {
17+
reg = <0x30000 DT_SIZE_K(64)>;
18+
};
19+
20+
slot0_partition: cpuapp_slot0_partition: partition@40000 {
21+
reg = <0x40000 DT_SIZE_K(1076)>;
22+
};
23+
24+
cpurad_slot0_partition: partition@14d000 {
25+
reg = <0x14d000 DT_SIZE_K(328)>;
26+
};
27+
28+
cpuppr_code_partition: partition@19f000 {
29+
reg = <0x19f000 DT_SIZE_K(64)>;
30+
};
31+
32+
cpuflpr_code_partition: partition@1af000 {
33+
reg = <0x1af000 DT_SIZE_K(48)>;
34+
};
35+
36+
storage_partition: partition@1bb000 {
37+
reg = <0x1bb000 DT_SIZE_K(40)>;
38+
};
39+
40+
periphconf_partition: partition@1c5000 {
41+
reg = <0x1c5000 DT_SIZE_K(8)>;
42+
};
43+
};
44+
};
45+
46+
/* Conflict with Wi-Fi SPI */
47+
&uart135 {
48+
status = "disabled";
49+
};

snippets/nrf70-wifi/snippet.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ boards:
77
nrf54h20dk/nrf54h20/cpuapp:
88
append:
99
EXTRA_CONF_FILE: nrf54h20_cpuapp.conf
10-
EXTRA_DTC_OVERLAY_FILE: nrf54h20_cpuapp.overlay
10+
EXTRA_DTC_OVERLAY_FILE: nrf54h20_wifi_memory_map.overlay
1111
nrf54h20dk/nrf54h20/cpurad:
1212
append:
1313
EXTRA_CONF_FILE: nrf54h20_cpurad.conf
14-
EXTRA_DTC_OVERLAY_FILE: nrf54h20_cpurad.overlay
14+
EXTRA_DTC_OVERLAY_FILE: nrf54h20_wifi_memory_map.overlay
1515
nrf54l15dk/nrf54l15/cpuapp:
1616
append:
1717
EXTRA_CONF_FILE: nrf54l15_cpuapp.conf

0 commit comments

Comments
 (0)