Skip to content

Commit a43eea5

Browse files
asmellbykartben
asmellby
authored and
kartben
committed
boards: silabs: Clean up flash partitions
Ensure that flash partitioning makes use of the entire flash with no overlapping regions. Remove scratch partitions. Signed-off-by: Aksel Skauge Mellbye <aksel.mellbye@silabs.com>
1 parent da58cc2 commit a43eea5

File tree

11 files changed

+85
-122
lines changed

11 files changed

+85
-122
lines changed

‎boards/silabs/dev_kits/pg23_pk2504a/pg23_pk2504a.dts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,22 +213,22 @@
213213
read-only;
214214
};
215215

216-
/* Reserve 208 kB for the application in slot 0 */
216+
/* Reserve 216 kB for the application in slot 0 */
217217
slot0_partition: partition@c000 {
218-
reg = <0x0000c000 DT_SIZE_K(208)>;
218+
reg = <0x0000c000 DT_SIZE_K(216)>;
219219
label = "image-0";
220220
};
221221

222-
/* Reserve 208 kB for the application in slot 1 */
223-
slot1_partition: partition@40000 {
224-
reg = <0x00040000 DT_SIZE_K(208)>;
222+
/* Reserve 216 kB for the application in slot 1 */
223+
slot1_partition: partition@42000 {
224+
reg = <0x00042000 DT_SIZE_K(216)>;
225225
label = "image-1";
226226
};
227227

228-
/* Reserve 32 kB for the scratch partition */
229-
scratch_partition: partition@74000 {
230-
reg = <0x00074000 DT_SIZE_K(32)>;
231-
label = "image-scratch";
228+
/* Reserve 32 kB for the storage partition */
229+
storage_partition: partition@78000 {
230+
reg = <0x00078000 DT_SIZE_K(32)>;
231+
label = "storage";
232232
};
233233
};
234234
};

‎boards/silabs/dev_kits/pg28_pk2506a/pg28_pk2506a.dts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -221,22 +221,22 @@
221221
read-only;
222222
};
223223

224-
/* Reserve 208 kB for the application in slot 0 */
224+
/* Reserve 472 kB for the application in slot 0 */
225225
slot0_partition: partition@c000 {
226-
reg = <0x0000c000 DT_SIZE_K(208)>;
226+
reg = <0x0000c000 DT_SIZE_K(472)>;
227227
label = "image-0";
228228
};
229229

230-
/* Reserve 208 kB for the application in slot 1 */
231-
slot1_partition: partition@40000 {
232-
reg = <0x00040000 DT_SIZE_K(208)>;
230+
/* Reserve 472 kB for the application in slot 1 */
231+
slot1_partition: partition@82000 {
232+
reg = <0x00082000 DT_SIZE_K(472)>;
233233
label = "image-1";
234234
};
235235

236-
/* Reserve 32 kB for the scratch partition */
237-
scratch_partition: partition@74000 {
238-
reg = <0x00074000 DT_SIZE_K(32)>;
239-
label = "image-scratch";
236+
/* Reserve 32 kB for the storage partition */
237+
storage_partition: partition@f8000 {
238+
reg = <0x000f8000 DT_SIZE_K(32)>;
239+
label = "storage";
240240
};
241241
};
242242
};

‎boards/silabs/dev_kits/sltb010a/sltb010a.dts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,26 +77,26 @@
7777
partitions {
7878
/* Reserve 48 KiB for the bootloader */
7979
boot_partition: partition@0 {
80-
reg = <0x00000000 0x0000c000>;
80+
reg = <0x00000000 DT_SIZE_K(48)>;
8181
label = "mcuboot";
8282
read-only;
8383
};
8484

8585
/* Reserve 224 KiB for the application in slot 0 */
8686
slot0_partition: partition@c000 {
87-
reg = <0x0000c000 0x00038000>;
87+
reg = <0x0000c000 DT_SIZE_K(224)>;
8888
label = "image-0";
8989
};
9090

9191
/* Reserve 224 KiB for the application in slot 1 */
9292
slot1_partition: partition@44000 {
93-
reg = <0x00044000 0x00038000>;
93+
reg = <0x00044000 DT_SIZE_K(224)>;
9494
label = "image-1";
9595
};
9696

9797
/* Set 16 KiB of storage at the end of the 512 KiB of flash */
9898
storage_partition: partition@7c000 {
99-
reg = <0x0007c000 0x00004000>;
99+
reg = <0x0007c000 DT_SIZE_K(16)>;
100100
label = "storage";
101101
};
102102
};

‎boards/silabs/dev_kits/xg22_ek2710a/xg22_ek2710a.dts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,26 +181,26 @@
181181

182182
/* Reserve 48 KiB for the bootloader */
183183
boot_partition: partition@0 {
184-
reg = <0x00000000 0x0000c000>;
184+
reg = <0x00000000 DT_SIZE_K(48)>;
185185
label = "mcuboot";
186186
read-only;
187187
};
188188

189189
/* Reserve 224 KiB for the application in slot 0 */
190190
slot0_partition: partition@c000 {
191-
reg = <0x0000c000 0x00038000>;
191+
reg = <0x0000c000 DT_SIZE_K(224)>;
192192
label = "image-0";
193193
};
194194

195195
/* Reserve 224 KiB for the application in slot 1 */
196196
slot1_partition: partition@44000 {
197-
reg = <0x00044000 0x00038000>;
197+
reg = <0x00044000 DT_SIZE_K(224)>;
198198
label = "image-1";
199199
};
200200

201201
/* Set 16 KiB of storage at the end of the 512 KiB of flash */
202202
storage_partition: partition@7c000 {
203-
reg = <0x0007c000 0x00004000>;
203+
reg = <0x0007c000 DT_SIZE_K(16)>;
204204
label = "storage";
205205
};
206206
};

‎boards/silabs/dev_kits/xg24_dk2601b/xg24_dk2601b.dts‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -256,32 +256,26 @@
256256

257257
/* Reserve 48 kB for the bootloader */
258258
boot_partition: partition@0 {
259-
reg = <0x0 0x0000c000>;
259+
reg = <0x0 DT_SIZE_K(48)>;
260260
label = "mcuboot";
261261
read-only;
262262
};
263263

264-
/* Reserve 464 kB for the application in slot 0 */
264+
/* Reserve 728 kB for the application in slot 0 */
265265
slot0_partition: partition@c000 {
266-
reg = <0x0000c000 0x00074000>;
266+
reg = <0x0000c000 DT_SIZE_K(728)>;
267267
label = "image-0";
268268
};
269269

270-
/* Reserve 464 kB for the application in slot 1 */
271-
slot1_partition: partition@80000 {
272-
reg = <0x00080000 0x00074000>;
270+
/* Reserve 728 kB for the application in slot 1 */
271+
slot1_partition: partition@c2000 {
272+
reg = <0x000c2000 DT_SIZE_K(728)>;
273273
label = "image-1";
274274
};
275275

276-
/* Reserve 32 kB for the scratch partition */
277-
scratch_partition: partition@f4000 {
278-
reg = <0x000f4000 0x00008000>;
279-
label = "image-scratch";
280-
};
281-
282-
/* Set 528Kb of storage at the end of the 1024Kb of flash */
283-
storage_partition: partition@fc000 {
284-
reg = <0x000fc000 0x00084000>;
276+
/* Set 32 kB of storage at the end of the 1536 kB of flash */
277+
storage_partition: partition@178000 {
278+
reg = <0x00178000 DT_SIZE_K(32)>;
285279
label = "storage";
286280
};
287281
};

‎boards/silabs/dev_kits/xg24_ek2703a/xg24_ek2703a.dts‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -172,32 +172,26 @@
172172

173173
/* Reserve 48 kB for the bootloader */
174174
boot_partition: partition@0 {
175-
reg = <0x0 0x0000c000>;
175+
reg = <0x0 DT_SIZE_K(48)>;
176176
label = "mcuboot";
177177
read-only;
178178
};
179179

180-
/* Reserve 464 kB for the application in slot 0 */
180+
/* Reserve 728 kB for the application in slot 0 */
181181
slot0_partition: partition@c000 {
182-
reg = <0x0000c000 0x00074000>;
182+
reg = <0x0000c000 DT_SIZE_K(728)>;
183183
label = "image-0";
184184
};
185185

186-
/* Reserve 464 kB for the application in slot 1 */
187-
slot1_partition: partition@80000 {
188-
reg = <0x00080000 0x00074000>;
186+
/* Reserve 728 kB for the application in slot 1 */
187+
slot1_partition: partition@c2000 {
188+
reg = <0x000c2000 DT_SIZE_K(728)>;
189189
label = "image-1";
190190
};
191191

192-
/* Reserve 32 kB for the scratch partition */
193-
scratch_partition: partition@f4000 {
194-
reg = <0x000f4000 0x00008000>;
195-
label = "image-scratch";
196-
};
197-
198-
/* Set 528Kb of storage at the end of the 1024Kb of flash */
199-
storage_partition: partition@fc000 {
200-
reg = <0x000fc000 0x00084000>;
192+
/* Set 32 kB of storage at the end of the 1536 kB of flash */
193+
storage_partition: partition@178000 {
194+
reg = <0x00178000 DT_SIZE_K(32)>;
201195
label = "storage";
202196
};
203197
};

‎boards/silabs/dev_kits/xg27_dk2602a/xg27_dk2602a.dts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,21 @@
8686
read-only;
8787
};
8888

89-
/* Reserve 328 KiB for the application in slot 0 */
89+
/* Reserve 344 KiB for the application in slot 0 */
9090
slot0_partition: partition@c000 {
91-
reg = <0x0000c000 0x00052000>;
91+
reg = <0x0000c000 DT_SIZE_K(344)>;
9292
label = "image-0";
9393
};
9494

95-
/* Reserve 328 KiB for the application in slot 1 */
96-
slot1_partition: partition@5e000 {
97-
reg = <0x0005e000 0x00052000>;
95+
/* Reserve 344 KiB for the application in slot 1 */
96+
slot1_partition: partition@62000 {
97+
reg = <0x00062000 DT_SIZE_K(344)>;
9898
label = "image-1";
9999
};
100100

101-
/* Set 64 KiB of storage at the end of the 768 KiB of flash */
102-
storage_partition: partition@b0000 {
103-
reg = <0x000b0000 0x00010000>;
101+
/* Set 32 KiB of storage at the end of the 768 KiB of flash */
102+
storage_partition: partition@b8000 {
103+
reg = <0x000b8000 DT_SIZE_K(32)>;
104104
label = "storage";
105105
};
106106
};

‎boards/silabs/radio_boards/slwrb4180a/slwrb4180a.dts‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -160,34 +160,27 @@
160160

161161
/* Reserve 48 kB for the bootloader */
162162
boot_partition: partition@0 {
163-
reg = <0x0 0x0000c000>;
163+
reg = <0x0 DT_SIZE_K(48)>;
164164
label = "mcuboot";
165165
read-only;
166166
};
167167

168-
/* Reserve 464 kB for the application in slot 0 */
168+
/* Reserve 472 kB for the application in slot 0 */
169169
slot0_partition: partition@c000 {
170-
reg = <0x0000c000 0x00074000>;
170+
reg = <0x0000c000 DT_SIZE_K(472)>;
171171
label = "image-0";
172172
};
173173

174-
/* Reserve 464 kB for the application in slot 1 */
175-
slot1_partition: partition@80000 {
176-
reg = <0x00080000 0x00074000>;
174+
/* Reserve 472 kB for the application in slot 1 */
175+
slot1_partition: partition@82000 {
176+
reg = <0x00082000 DT_SIZE_K(472)>;
177177
label = "image-1";
178178
};
179179

180-
/* Reserve 32 kB for the scratch partition */
181-
scratch_partition: partition@f4000 {
182-
reg = <0x000f4000 0x00008000>;
183-
label = "image-scratch";
184-
};
185-
186-
/* Set 16Kb of storage at the end of the 1024Kb of flash */
187-
storage_partition: partition@fc000 {
188-
reg = <0x000fc000 0x00004000>;
180+
/* Set 32Kb of storage at the end of the 1024Kb of flash */
181+
storage_partition: partition@f8000 {
182+
reg = <0x000f8000 DT_SIZE_K(32)>;
189183
label = "storage";
190184
};
191-
192185
};
193186
};

‎boards/silabs/radio_boards/xg23_rb4210a/xg23_rb4210a.dts‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -261,27 +261,21 @@
261261
read-only;
262262
};
263263

264-
/* Reserve 208 kB for the application in slot 0 */
264+
/* Reserve 216 kB for the application in slot 0 */
265265
slot0_partition: partition@c000 {
266-
reg = <0x0000c000 DT_SIZE_K(208)>;
266+
reg = <0x0000c000 DT_SIZE_K(216)>;
267267
label = "image-0";
268268
};
269269

270-
/* Reserve 208 kB for the application in slot 1 */
271-
slot1_partition: partition@40000 {
272-
reg = <0x00040000 DT_SIZE_K(208)>;
270+
/* Reserve 216 kB for the application in slot 1 */
271+
slot1_partition: partition@42000 {
272+
reg = <0x00042000 DT_SIZE_K(216)>;
273273
label = "image-1";
274274
};
275275

276-
/* Reserve 32 kB for the scratch partition */
277-
scratch_partition: partition@74000 {
278-
reg = <0x00074000 DT_SIZE_K(32)>;
279-
label = "image-scratch";
280-
};
281-
282-
/* Set 16 kB of storage at the end of the 1536 kB of flash */
283-
storage_partition: partition@7c000 {
284-
reg = <0x0007c000 DT_SIZE_K(16)>;
276+
/* Set 32 kB of storage at the end of the 512 kB of flash */
277+
storage_partition: partition@78000 {
278+
reg = <0x00078000 DT_SIZE_K(32)>;
285279
label = "storage";
286280
};
287281
};

‎boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c.dts‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -236,27 +236,21 @@
236236
read-only;
237237
};
238238

239-
/* Reserve 720 kB for the application in slot 0 */
239+
/* Reserve 728 kB for the application in slot 0 */
240240
slot0_partition: partition@c000 {
241-
reg = <0x0000c000 0x000B4000>;
241+
reg = <0x0000c000 DT_SIZE_K(728)>;
242242
label = "image-0";
243243
};
244244

245-
/* Reserve 720 kB for the application in slot 1 */
246-
slot1_partition: partition@C0000 {
247-
reg = <0x000C0000 0x000B4000>;
245+
/* Reserve 728 kB for the application in slot 1 */
246+
slot1_partition: partition@c2000 {
247+
reg = <0x000c2000 DT_SIZE_K(728)>;
248248
label = "image-1";
249249
};
250250

251-
/* Reserve 32 kB for the scratch partition */
252-
scratch_partition: partition@174000 {
253-
reg = <0x00174000 DT_SIZE_K(32)>;
254-
label = "image-scratch";
255-
};
256-
257-
/* Set 16 kB of storage at the end of the 1536 kB of flash */
258-
storage_partition: partition@17c000 {
259-
reg = <0x0017c000 DT_SIZE_K(16)>;
251+
/* Set 32 kB of storage at the end of the 1536 kB of flash */
252+
storage_partition: partition@178000 {
253+
reg = <0x00178000 DT_SIZE_K(32)>;
260254
label = "storage";
261255
};
262256
};

0 commit comments

Comments
 (0)