Skip to content

Commit 0ae992e

Browse files
hakonfamjonathannilsen
authored andcommitted
[nrf fromlist] dts: update memory map and remove ext-uicr
Upstream PR: zephyrproject-rtos/zephyr#79507 Extended UICR will not be used as its configurations will be merged with the UICR registers in NVR. Memory maps changes are needed to align with pre compiled firmware. Signed-off-by: Håkon Amundsen <[email protected]> Signed-off-by: Jonathan Nilsen <[email protected]>
1 parent 94340b3 commit 0ae992e

File tree

8 files changed

+45
-21
lines changed

8 files changed

+45
-21
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
/delete-node/ &suit_storage_partition;
8+
9+
/ {
10+
reserved-memory {
11+
suit_storage_partition: memory@e1eb000 {
12+
reg = <0xe1eb000 DT_SIZE_K(24)>;
13+
};
14+
};
15+
};
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"

dts/bindings/arm/nordic,nrf-uicr-v2.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,3 @@ properties:
1717
description: |
1818
Domain ID of the domain associated with this UICR instance. Must be unique
1919
across all UICR instances in the system.
20-
21-
ptr-ext-uicr:
22-
type: phandle
23-
required: true
24-
description: |
25-
Handle of a memory region reserved to contain an Extended UICR instance.
26-
The address of that node will be stored in the UICR.PTREXTUICR register.

dts/common/nordic/nrf54h20.dtsi

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,8 @@
147147
#address-cells = <1>;
148148
#size-cells = <1>;
149149

150-
suit_storage_partition: memory@e1eb000 {
151-
reg = <0xe1eb000 DT_SIZE_K(24)>;
152-
};
153-
154-
cpurad_uicr_ext: memory@e1ff000 {
155-
reg = <0xe1ff000 DT_SIZE_K(2)>;
156-
};
157-
158-
cpuapp_uicr_ext: memory@e1ff800 {
159-
reg = <0xe1ff800 DT_SIZE_K(2)>;
150+
suit_storage_partition: memory@e1ed000 {
151+
reg = <0xe1ed000 DT_SIZE_K(20)>;
160152
};
161153
};
162154

@@ -219,14 +211,12 @@
219211
compatible = "nordic,nrf-uicr-v2";
220212
reg = <0xfff8000 DT_SIZE_K(2)>;
221213
domain = <2>;
222-
ptr-ext-uicr = <&cpuapp_uicr_ext>;
223214
};
224215

225216
cpurad_uicr: uicr@fffa000 {
226217
compatible = "nordic,nrf-uicr-v2";
227218
reg = <0xfffa000 DT_SIZE_K(2)>;
228219
domain = <3>;
229-
ptr-ext-uicr = <&cpurad_uicr_ext>;
230220
};
231221

232222
ficr: ficr@fffe000 {

dts/common/nordic/nrf9280.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,12 @@
113113
compatible = "nordic,nrf-uicr-v2";
114114
reg = <0xfff8000 DT_SIZE_K(2)>;
115115
domain = <2>;
116-
ptr-ext-uicr = <&cpuapp_uicr_ext>;
117116
};
118117

119118
cpurad_uicr: uicr@fffa000 {
120119
compatible = "nordic,nrf-uicr-v2";
121120
reg = <0xfffa000 DT_SIZE_K(2)>;
122121
domain = <3>;
123-
ptr-ext-uicr = <&cpurad_uicr_ext>;
124122
};
125123

126124
ficr: ficr@fffe000 {

0 commit comments

Comments
 (0)