Skip to content

[nrf-fromlist] dts: update memory map and remove ext-uicr #2071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hakonfam merged 1 commit into from
Oct 21, 2024
Merged

[nrf-fromlist] dts: update memory map and remove ext-uicr #2071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/

/delete-node/ &suit_storage_partition;

/ {
reserved-memory {
suit_storage_partition: memory@e1eb000 {
reg = <0xe1eb000 DT_SIZE_K(24)>;
};
};
};
7 changes: 7 additions & 0 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/

#include <nrf54h20dk_nrf54h20_0_8_0.dtsi>
7 changes: 7 additions & 0 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/

#include <nrf54h20dk_nrf54h20_0_8_0.dtsi>
7 changes: 7 additions & 0 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/

#include <nrf54h20dk_nrf54h20_0_8_0.dtsi>
7 changes: 7 additions & 0 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/

#include <nrf54h20dk_nrf54h20_0_8_0.dtsi>
7 changes: 0 additions & 7 deletions dts/bindings/arm/nordic,nrf-uicr-v2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,3 @@ properties:
description: |
Domain ID of the domain associated with this UICR instance. Must be unique
across all UICR instances in the system.

ptr-ext-uicr:
type: phandle
required: true
description: |
Handle of a memory region reserved to contain an Extended UICR instance.
The address of that node will be stored in the UICR.PTREXTUICR register.
14 changes: 2 additions & 12 deletions dts/common/nordic/nrf54h20.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,8 @@
#address-cells = <1>;
#size-cells = <1>;

suit_storage_partition: memory@e1eb000 {
reg = <0xe1eb000 DT_SIZE_K(24)>;
};

cpurad_uicr_ext: memory@e1ff000 {
reg = <0xe1ff000 DT_SIZE_K(2)>;
};

cpuapp_uicr_ext: memory@e1ff800 {
reg = <0xe1ff800 DT_SIZE_K(2)>;
suit_storage_partition: memory@e1ed000 {
reg = <0xe1ed000 DT_SIZE_K(20)>;
};
};

Expand Down Expand Up @@ -219,14 +211,12 @@
compatible = "nordic,nrf-uicr-v2";
reg = <0xfff8000 DT_SIZE_K(2)>;
domain = <2>;
ptr-ext-uicr = <&cpuapp_uicr_ext>;
};

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

ficr: ficr@fffe000 {
Expand Down
2 changes: 0 additions & 2 deletions dts/common/nordic/nrf9280.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,12 @@
compatible = "nordic,nrf-uicr-v2";
reg = <0xfff8000 DT_SIZE_K(2)>;
domain = <2>;
ptr-ext-uicr = <&cpuapp_uicr_ext>;
};

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

ficr: ficr@fffe000 {
Expand Down
Loading