Skip to content
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

Jump to bottom

Tddconf flexible etrbuffer #2218

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Tddconf flexible etrbuffer #2218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad0f474
dts: bindings: arm: nordic: tddconf: Add etrbuffer
karstenkoenig Oct 30, 2024
bdf9b12
boards: nordic: nrf54h20dk: Move etr region
karstenkoenig Nov 4, 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
23 changes: 6 additions & 17 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 @@ -24,8 +24,12 @@
reg = <0x800 DT_SIZE_K(2)>;
};

cpuapp_data: memory@1000 {
reg = <0x1000 DT_SIZE_K(256)>;
etr_buffer: memory@1000 {
reg = <0x1000 DT_SIZE_K(4)>;
};

cpuapp_data: memory@2000 {
reg = <0x2000 DT_SIZE_K(252)>;
};
};

Expand All @@ -47,21 +51,6 @@
};
};

etr_buf_ram0x_region: memory@2f0be000 {
compatible = "nordic,owned-memory";
reg = <0x2f0be000 DT_SIZE_K(4)>;
status = "disabled";
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x2f0be000 0x1000>;

/* TODO In future move this region to cpuapp_ram0x_region. */
etr_buffer: memory@0 {
reg = <0x0 DT_SIZE_K(4)>;
};
};

cpuapp_cpurad_ram0x_region: memory@2f0bf000 {
compatible = "nordic,owned-memory";
reg = <0x2f0bf000 DT_SIZE_K(4)>;
Expand Down
4 changes: 0 additions & 4 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 @@ -119,10 +119,6 @@
status = "okay";
};

&etr_buf_ram0x_region {
status = "okay";
};

&ram21_region {
status = "okay";
};
Expand Down
4 changes: 4 additions & 0 deletions dts/bindings/arm/nordic,nrf-tddconf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,7 @@ properties:
- 1
- 2
- 3

etrbuffer:
description: phandle to the memory region used for the ETR buffer
type: phandle
1 change: 1 addition & 0 deletions snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
NRF_TDDCONF_SOURCE_STMFLPR)>;
portconfig = <0>;
etrbuffer = <&etr_buffer>;
};
1 change: 1 addition & 0 deletions snippets/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
&tddconf {
status = "okay";
etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE)>;
etrbuffer = <&etr_buffer>;
};
1 change: 1 addition & 0 deletions snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
NRF_TDDCONF_SOURCE_STMFLPR)>;
portconfig = <0>;
etrbuffer = <&etr_buffer>;
};
1 change: 1 addition & 0 deletions snippets/nordic-log-stm/boards/nrf54h20_cpurad.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
&tddconf {
status = "okay";
etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE)>;
etrbuffer = <&etr_buffer>;
};
Loading