Skip to content

nrf-regtool 7.0.0 + nordic,access + J-Link scripts #2075

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
merged 8 commits into from
Oct 17, 2024
Merged

nrf-regtool 7.0.0 + nordic,access + J-Link scripts #2075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4c3f464
[nrf fromtree] boards: nordic: update custom JLink reset scheme for A…
jonathannilsen Sep 12, 2024
b847740
[nrf fromtree] boards: nordic: nrf54h20dk: make RAM3x DMA region larg…
nika-nordic Oct 7, 2024
6a12358
[nrf fromtree] dts: bindings: Update Nordic owned memory bindings
57300 May 3, 2024
1cb55cb
[nrf fromtree] boards: nordic: Align with updated Nordic owned memory…
57300 May 3, 2024
2f58d94
[nrf fromtree] boards: nordic: Flatten shared_ramxx_region nodes
57300 Oct 8, 2024
979009c
Revert "[nrf noup] dts: nordic: Add support for BICR generation"
57300 Oct 16, 2024
e9552eb
[nrf fromlist] modules: hal_nordic: Integrate nrf-regtool 7.0.0
57300 Oct 16, 2024
5952fe7
[nrf noup] dts: nordic: Add support for BICR generation
57300 Jun 5, 2024
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
111 changes: 40 additions & 71 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
compatible = "nordic,owned-memory";
reg = <0x2f010000 DT_SIZE_K(260)>;
status = "disabled";
perm-read;
perm-write;
perm-secure;
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x2f010000 0x41000>;
Expand All @@ -35,9 +33,7 @@
compatible = "nordic,owned-memory";
reg = <0x2f051000 DT_SIZE_K(4)>;
status = "disabled";
perm-read;
perm-write;
perm-secure;
nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x2f051000 0x1000>;
Expand All @@ -55,9 +51,7 @@
compatible = "nordic,owned-memory";
reg = <0x2f0be000 DT_SIZE_K(4)>;
status = "disabled";
perm-read;
perm-write;
perm-secure;
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x2f0be000 0x1000>;
Expand All @@ -72,8 +66,8 @@
compatible = "nordic,owned-memory";
reg = <0x2f0bf000 DT_SIZE_K(4)>;
status = "disabled";
perm-read;
perm-write;
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>,
<NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x2f0bf000 0x1000>;
Expand All @@ -87,40 +81,32 @@
};
};

shared_ram20_region: memory@2f88f000 {
reg = <0x2f88f000 DT_SIZE_K(4)>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x2f88f000 0x1000>;

cpuapp_cpusys_ipc_shm: memory@ce0 {
reg = <0xce0 0x80>;
};
cpuapp_cpusys_ipc_shm: memory@2f88fce0 {
reg = <0x2f88fce0 0x80>;
};

cpusys_cpuapp_ipc_shm: memory@d60 {
reg = <0xd60 0x80>;
};
cpusys_cpuapp_ipc_shm: memory@2f88fd60 {
reg = <0x2f88fd60 0x80>;
};

cpurad_cpusys_ipc_shm: memory@e00 {
reg = <0xe00 0x80>;
};
cpurad_cpusys_ipc_shm: memory@2f88fe00 {
reg = <0x2f88fe00 0x80>;
};

cpusys_cpurad_ipc_shm: memory@e80 {
reg = <0xe80 0x80>;
};
cpusys_cpurad_ipc_shm: memory@2f88fe80 {
reg = <0x2f88fe80 0x80>;
};

/*
* NOTE: perm-execute is not required as FLPR has a direct
* bridge with RAM21, bypassing MPC.
* NOTE: FLPR has a direct bridge with RAM21 that bypasses MPC.
* This means that when this region is marked as non-executable,
* only FLPR can execute code from it.
*/
ram21_region: memory@2f890000 {
compatible = "nordic,owned-memory";
status = "disabled";
reg = <0x2f890000 DT_SIZE_K(64)>;
perm-read;
perm-write;
perm-secure;
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x2f890000 0x10000>;
Expand Down Expand Up @@ -151,9 +137,7 @@
compatible = "nordic,owned-memory";
reg = <0x2fc00000 DT_SIZE_K(64)>;
status = "disabled";
perm-read;
perm-write;
perm-execute;
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWX>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x2fc00000 0x10000>;
Expand All @@ -171,33 +155,24 @@
};
};

shared_ram3x_region: memory@2fc12000 {
compatible = "nordic,owned-memory";
reg = <0x2fc12000 DT_SIZE_K(8)>;
cpuapp_dma_region: memory@2fc12000 {
compatible = "nordic,owned-memory", "zephyr,memory-region";
reg = <0x2fc12000 DT_SIZE_K(4)>;
status = "disabled";
perm-read;
perm-write;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x2fc12000 0x2000>;

cpuapp_dma_region: memory@e80 {
compatible = "zephyr,memory-region";
reg = <0xe80 DT_SIZE_K(4)>;
status = "disabled";
#memory-region-cells = <0>;
zephyr,memory-region = "DMA_RAM3x_APP";
zephyr,memory-attr = <( DT_MEM_DMA )>;
};
#memory-region-cells = <0>;
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
zephyr,memory-region = "DMA_RAM3x_APP";
zephyr,memory-attr = <( DT_MEM_DMA )>;
};

cpurad_dma_region: memory@1e80 {
compatible = "zephyr,memory-region";
reg = <0x1e80 0x80>;
status = "disabled";
#memory-region-cells = <0>;
zephyr,memory-region = "DMA_RAM3x_RAD";
zephyr,memory-attr = <( DT_MEM_DMA )>;
};
cpurad_dma_region: memory@2fc13000 {
compatible = "nordic,owned-memory", "zephyr,memory-region";
reg = <0x2fc13000 DT_SIZE_K(1)>;
status = "disabled";
#memory-region-cells = <0>;
nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
zephyr,memory-region = "DMA_RAM3x_RAD";
zephyr,memory-attr = <( DT_MEM_DMA )>;
};
};
};
Expand All @@ -206,9 +181,7 @@
cpurad_rx_partitions: cpurad-rx-partitions {
compatible = "nordic,owned-partitions", "fixed-partitions";
status = "disabled";
perm-read;
perm-execute;
perm-secure;
nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RXS>;
#address-cells = <1>;
#size-cells = <1>;

Expand All @@ -220,9 +193,7 @@
cpuapp_rx_partitions: cpuapp-rx-partitions {
compatible = "nordic,owned-partitions", "fixed-partitions";
status = "disabled";
perm-read;
perm-execute;
perm-secure;
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RXS>;
#address-cells = <1>;
#size-cells = <1>;

Expand All @@ -242,9 +213,7 @@
cpuapp_rw_partitions: cpuapp-rw-partitions {
compatible = "nordic,owned-partitions", "fixed-partitions";
status = "disabled";
perm-read;
perm-write;
perm-secure;
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
#address-cells = <1>;
#size-cells = <1>;

Expand Down
8 changes: 0 additions & 8 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,6 @@
status = "okay";
};

&cpuapp_cpurad_ram0x_region {
status = "okay";
};

&shared_ram3x_region {
status = "okay";
};

&ram21_region {
status = "okay";
};
Expand Down
4 changes: 0 additions & 4 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@
};
};

&shared_ram3x_region {
status = "okay";
};

&cpuapp_cpurad_ram0x_region {
status = "okay";
};
Expand Down
Loading
Loading