Skip to content

Commit 6fb9553

Browse files
hakonfamcarlescufi
authored andcommitted
applications: machine_learning: align overlay with IronSide
Ref: NCSDK-NONE Signed-off-by: Håkon Amundsen <[email protected]>
1 parent 0804e75 commit 6fb9553

File tree

3 files changed

+25
-96
lines changed

3 files changed

+25
-96
lines changed

applications/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ ipc1: &cpuapp_cpuppr_ipc {
5050
status = "okay";
5151
};
5252

53-
/* Expand APP slot partition and remove DFU partition. */
54-
/delete-node/ &cpuapp_rx_partitions;
55-
/delete-node/ &cpuapp_rw_partitions;
56-
5753
&cpuppr_ram3x_region {
5854
cpuppr_code_data: memory@0 {
5955
reg = <0x0 0xf200>;
@@ -64,36 +60,22 @@ ipc1: &cpuapp_cpuppr_ipc {
6460
};
6561
};
6662

63+
/delete-node/ &cpuapp_slot0_partition;
64+
/delete-node/ &cpurad_slot0_partition;
65+
6766
&mram1x {
68-
cpuapp_rx_partitions: cpuapp-rx-partitions {
69-
compatible = "nordic,owned-partitions", "fixed-partitions";
70-
status = "okay";
71-
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RXS>;
72-
#address-cells = <1>;
73-
#size-cells = <1>;
74-
75-
cpuapp_slot0_partition: partition@a6000 {
76-
reg = <0xa6000 DT_SIZE_K(512)>;
77-
};
78-
79-
cpuppr_code_partition: partition@126000 {
80-
reg = <0x126000 DT_SIZE_K(64)>;
81-
};
82-
};
83-
84-
cpuapp_rw_partitions: cpuapp-rw-partitions {
85-
compatible = "nordic,owned-partitions", "fixed-partitions";
86-
status = "okay";
87-
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
88-
#address-cells = < 0x1 >;
89-
#size-cells = < 0x1 >;
90-
91-
storage_partition: partition@136000 {
92-
reg = < 0x136000 DT_SIZE_K(24) >;
93-
};
94-
};
67+
partitions {
68+
cpuapp_slot0_partition: slot0_partition: partition@30000 {
69+
reg = <0x30000 0x82000>;
70+
};
71+
72+
cpurad_slot0_partition: partition@82000 {
73+
reg = < 0x82000 0x62000 >;
74+
};
75+
};
9576
};
9677

78+
9779
/* Remove DTS nodes associated with the cpuflpr target as they refer to the
9880
* cpuflpr_code_partition label from the cpuapp_rx_partitions node. The label has
9981
* been removed in this file due to the modification of the cpuapp_rx_partitions

applications/machine_learning/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
};
1717
};
1818

19-
/* Expand APP slot partition and remove DFU partition. */
20-
/delete-node/ &cpuapp_rx_partitions;
21-
/delete-node/ &cpuapp_rw_partitions;
22-
2319
/*
2420
* Place aggregator buffers in PPR memory region.
2521
*/
@@ -33,35 +29,20 @@
3329
};
3430
};
3531

32+
/delete-node/ &cpuapp_slot0_partition;
33+
/delete-node/ &cpurad_slot0_partition;
34+
3635
/* This duplicates the Application core configuration to build PPR image under valid address. */
3736
&mram1x {
38-
cpuapp_rx_partitions: cpuapp-rx-partitions {
39-
compatible = "nordic,owned-partitions", "fixed-partitions";
40-
status = "okay";
41-
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RXS>;
42-
#address-cells = <1>;
43-
#size-cells = <1>;
44-
45-
cpuapp_slot0_partition: partition@a6000 {
46-
reg = <0xa6000 DT_SIZE_K(512)>;
47-
};
48-
49-
cpuppr_code_partition: partition@126000 {
50-
reg = <0x126000 DT_SIZE_K(64)>;
51-
};
52-
};
53-
54-
cpuapp_rw_partitions: cpuapp-rw-partitions {
55-
compatible = "nordic,owned-partitions", "fixed-partitions";
56-
status = "okay";
57-
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
58-
#address-cells = < 0x1 >;
59-
#size-cells = < 0x1 >;
60-
61-
storage_partition: partition@136000 {
62-
reg = < 0x136000 DT_SIZE_K(24) >;
63-
};
64-
};
37+
partitions {
38+
cpuapp_slot0_partition: slot0_partition: partition@30000 {
39+
reg = <0x30000 0x82000>;
40+
};
41+
42+
cpurad_slot0_partition: partition@82000 {
43+
reg = <0xa2000 0x32000>;
44+
};
45+
};
6546
};
6647

6748
ipc1: &cpuapp_cpuppr_ipc {

applications/machine_learning/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.overlay

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,3 @@
1818
&cpurad_dma_region {
1919
status = "disabled";
2020
};
21-
22-
/* Expand APP slot partition and remove DFU partition. */
23-
/delete-node/ &cpuapp_rx_partitions;
24-
/delete-node/ &cpuapp_rw_partitions;
25-
26-
&mram1x {
27-
cpuapp_rx_partitions: cpuapp-rx-partitions {
28-
compatible = "nordic,owned-partitions", "fixed-partitions";
29-
status = "disabled";
30-
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RXS>;
31-
#address-cells = <1>;
32-
#size-cells = <1>;
33-
34-
cpuapp_slot0_partition: partition@a6000 {
35-
reg = <0xa6000 DT_SIZE_K(512)>;
36-
};
37-
38-
cpuppr_code_partition: partition@126000 {
39-
reg = <0x126000 DT_SIZE_K(64)>;
40-
};
41-
};
42-
43-
cpuapp_rw_partitions: cpuapp-rw-partitions {
44-
compatible = "nordic,owned-partitions", "fixed-partitions";
45-
status = "disabled";
46-
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
47-
#address-cells = < 0x1 >;
48-
#size-cells = < 0x1 >;
49-
50-
storage_partition: partition@136000 {
51-
reg = < 0x136000 DT_SIZE_K(24) >;
52-
};
53-
};
54-
};

0 commit comments

Comments
 (0)