Skip to content

Commit f1e18c5

Browse files
nordicjmcfriedt
authored andcommitted
dts: vendor: nordic: nrf91: Fix SRAM partitioning
Uses the correct way to partition memory as per the linux binding, also fixes names which were not compliant with the zephyr devicetree guidelines Signed-off-by: Jamie McCrae <[email protected]>
1 parent 50b1732 commit f1e18c5

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

dts/vendor/nordic/nrf91xx_partition.dtsi

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
};
9595
};
9696

97-
/ {
97+
&sram0 {
9898
/*
9999
* Default SRAM planning when building for nRF91xx with
100100
* ARM TrustZone-M support
@@ -104,29 +104,26 @@
104104
* - 40 kB SRAM reserved for and used by the modem library (sram0_ns_modem).
105105
* - 128 kB allocated to the application (sram0_ns_app).
106106
*/
107-
reserved-memory {
107+
sram0_s: sram@0 {
108+
/* Secure image memory */
109+
reg = <0x0 DT_SIZE_K(88)>;
110+
};
111+
112+
sram0_ns: sram@16000 {
113+
/* Non-Secure image memory */
114+
reg = <0x16000 DT_SIZE_K(168)>;
108115
#address-cells = <1>;
109116
#size-cells = <1>;
110-
ranges;
111-
112-
sram0_s: image_s@20000000 {
113-
/* Secure image memory */
114-
reg = <0x20000000 DT_SIZE_K(88)>;
115-
};
116-
117-
sram0_ns: image_ns@20016000 {
118-
/* Non-Secure image memory */
119-
reg = <0x20016000 DT_SIZE_K(168)>;
120-
};
117+
ranges = <0x0 0x16000 DT_SIZE_K(168)>;
121118

122-
sram0_ns_modem: image_ns_modem@20016000 {
119+
sram0_ns_modem: sram@0 {
123120
/* Modem (shared) memory */
124-
reg = <0x20016000 DT_SIZE_K(40)>;
121+
reg = <0x0 DT_SIZE_K(40)>;
125122
};
126123

127-
sram0_ns_app: image_ns_app@20020000 {
124+
sram0_ns_app: sram@a000 {
128125
/* Non-Secure application memory */
129-
reg = <0x20020000 DT_SIZE_K(128)>;
126+
reg = <0xa000 DT_SIZE_K(128)>;
130127
};
131128
};
132129
};

0 commit comments

Comments
 (0)