Skip to content

Commit 5717182

Browse files
Vge0rgemichalek-no
authored andcommitted
boards: dts: Update memory layout for nRF54L
The softdevice targets for the nRF54L series had the softdevice memory placed on the starting address of RAM and the application RAM placed next. This is problematic because the Cracen driver for these devices assumes that it owns the top 64 bytes of memory (starting from 0x2000000). Rearrange the memory layout of these devices so that it it places the softdevice memory is placed after the application memory. I also noticed that the partitions softdevice_static_ram and softdevice_dynamic_ram had a gap between them. I removed this gap since I cannot see why it is needed. Signed-off-by: Georgios Vasilakis <[email protected]>
1 parent 94db66b commit 5717182

7 files changed

+55
-55
lines changed

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice.dts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@
4444
#address-cells = <1>;
4545
#size-cells = <1>;
4646

47-
softdevice_static_ram: partition@20000000 {
48-
label = "softdevice_static_ram";
49-
reg = <0x20000000 DT_SIZE_K(5)>;
47+
app_ram: partition@20000000 {
48+
label = "app_ram";
49+
reg = <0x20000000 DT_SIZE_K(78)>;
5050
};
5151

52-
softdevice_dynamic_ram: partition@20001678 {
53-
label = "softdevice_dynamic_ram";
54-
reg = <0x20001678 DT_SIZE_K(12)>;
52+
softdevice_static_ram: partition@20013800 {
53+
label = "softdevice_static_ram";
54+
reg = <0x20013800 DT_SIZE_K(5)>;
5555
};
5656

57-
app_ram: partition@20004678 {
58-
label = "app_ram";
59-
reg = <0x20004678 DT_SIZE_K(78)>;
57+
softdevice_dynamic_ram: partition@20014BCE {
58+
label = "softdevice_dynamic_ram";
59+
reg = <0x20014BCE DT_SIZE_K(12)>;
6060
};
6161
};
6262
};

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot.dts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,19 @@
8080
#address-cells = <1>;
8181
#size-cells = <1>;
8282

83-
softdevice_static_ram: partition@20000000 {
84-
label = "softdevice_static_ram";
85-
reg = <0x20000000 DT_SIZE_K(5)>;
83+
app_ram: partition@20000000 {
84+
label = "app_ram";
85+
reg = <0x20000000 DT_SIZE_K(78)>;
8686
};
8787

88-
softdevice_dynamic_ram: partition@20001400 {
89-
label = "softdevice_dynamic_ram";
90-
reg = <0x20001400 DT_SIZE_K(12)>;
88+
softdevice_static_ram: partition@20013800 {
89+
label = "softdevice_static_ram";
90+
reg = <0x20013800 DT_SIZE_K(5)>;
9191
};
9292

93-
app_ram: partition@20004400 {
94-
label = "app_ram";
95-
reg = <0x20004400 DT_SIZE_K(78)>;
93+
softdevice_dynamic_ram: partition@20014BCE {
94+
label = "softdevice_dynamic_ram";
95+
reg = <0x20014BCE DT_SIZE_K(12)>;
9696
};
9797
};
9898
};

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice.dts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@
4444
#address-cells = <1>;
4545
#size-cells = <1>;
4646

47-
softdevice_static_ram: partition@20000000 {
48-
label = "softdevice_static_ram";
49-
reg = <0x20000000 DT_SIZE_K(5)>;
47+
app_ram: partition@20000000 {
48+
label = "app_ram";
49+
reg = <0x20000000 DT_SIZE_K(174)>;
5050
};
5151

52-
softdevice_dynamic_ram: partition@20001678 {
53-
label = "softdevice_dynamic_ram";
54-
reg = <0x20001678 DT_SIZE_K(12)>;
52+
softdevice_static_ram: partition@2002B800 {
53+
label = "softdevice_static_ram";
54+
reg = <0x2002B800 DT_SIZE_K(5)>;
5555
};
5656

57-
app_ram: partition@20004678 {
58-
label = "app_ram";
59-
reg = <0x20004678 DT_SIZE_K(174)>;
57+
softdevice_dynamic_ram: partition@2002CC00 {
58+
label = "softdevice_dynamic_ram";
59+
reg = <0x2002CC00 DT_SIZE_K(12)>;
6060
};
6161
};
6262
};

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot.dts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,19 @@
8080
#address-cells = <1>;
8181
#size-cells = <1>;
8282

83-
softdevice_static_ram: partition@20000000 {
84-
label = "softdevice_static_ram";
85-
reg = <0x20000000 DT_SIZE_K(5)>;
83+
app_ram: partition@20000000 {
84+
label = "app_ram";
85+
reg = <0x20000000 DT_SIZE_K(174)>;
8686
};
8787

88-
softdevice_dynamic_ram: partition@20001400 {
89-
label = "softdevice_dynamic_ram";
90-
reg = <0x20001400 DT_SIZE_K(12)>;
88+
softdevice_static_ram: partition@2002B800 {
89+
label = "softdevice_static_ram";
90+
reg = <0x2002B800 DT_SIZE_K(5)>;
9191
};
9292

93-
app_ram: partition@20004400 {
94-
label = "app_ram";
95-
reg = <0x20004400 DT_SIZE_K(174)>;
93+
softdevice_dynamic_ram: partition@2002CC00 {
94+
label = "softdevice_dynamic_ram";
95+
reg = <0x2002CC00 DT_SIZE_K(12)>;
9696
};
9797
};
9898
};

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice.dts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@
4444
#address-cells = <1>;
4545
#size-cells = <1>;
4646

47-
softdevice_static_ram: partition@20000000 {
48-
label = "softdevice_static_ram";
49-
reg = <0x20000000 DT_SIZE_K(5)>;
47+
app_ram: partition@20000000{
48+
label = "app_ram";
49+
reg = <0x20000000 DT_SIZE_K(238)>;
5050
};
5151

52-
softdevice_dynamic_ram: partition@20001678 {
53-
label = "softdevice_dynamic_ram";
54-
reg = <0x20001678 DT_SIZE_K(12)>;
52+
softdevice_static_ram: partition@2003B800 {
53+
label = "softdevice_static_ram";
54+
reg = <0x2003B800 DT_SIZE_K(5)>;
5555
};
5656

57-
app_ram: partition@20004678 {
58-
label = "app_ram";
59-
reg = <0x20004678 DT_SIZE_K(238)>;
57+
softdevice_dynamic_ram: partition@2003CC00 {
58+
label = "softdevice_dynamic_ram";
59+
reg = <0x2003CC00 DT_SIZE_K(12)>;
6060
};
6161
};
6262
};

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot.dts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,19 @@
8080
#address-cells = <1>;
8181
#size-cells = <1>;
8282

83-
softdevice_static_ram: partition@20000000 {
84-
label = "softdevice_static_ram";
85-
reg = <0x20000000 DT_SIZE_K(5)>;
83+
app_ram: partition@20000000{
84+
label = "app_ram";
85+
reg = <0x20000000 DT_SIZE_K(238)>;
8686
};
8787

88-
softdevice_dynamic_ram: partition@20001400 {
89-
label = "softdevice_dynamic_ram";
90-
reg = <0x20001400 DT_SIZE_K(12)>;
88+
softdevice_static_ram: partition@2003B800 {
89+
label = "softdevice_static_ram";
90+
reg = <0x2003B800 DT_SIZE_K(5)>;
9191
};
9292

93-
app_ram: partition@20004400 {
94-
label = "app_ram";
95-
reg = <0x20004400 DT_SIZE_K(238)>;
93+
softdevice_dynamic_ram: partition@2003CC00 {
94+
label = "softdevice_dynamic_ram";
95+
reg = <0x2003CC00 DT_SIZE_K(12)>;
9696
};
9797
};
9898
};

subsys/softdevice_handler/nrf_sdh_ble.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <ble.h>
1212
#include <zephyr/logging/log.h>
1313

14-
#define APP_RAM_START DT_REG_ADDR(DT_CHOSEN(zephyr_sram))
14+
#define APP_RAM_START DT_REG_ADDR(DT_NODELABEL(softdevice_static_ram))
1515

1616
LOG_MODULE_DECLARE(nrf_sdh, CONFIG_NRF_SDH_LOG_LEVEL);
1717

0 commit comments

Comments
 (0)