Skip to content

Commit 83aa7ce

Browse files
mike-scottgalak
mike-scott
authored and
galak
committed
boards: arm: nrf52840-based: Free up flash room for sample apps
The current flash configurations for all nRF52840's in Zephyr is VERY constrained when it comes to allowing samples any space for storage or custom areas. It only leaves the last 4 pages of flash for "storage". The nRF52840 is also capable of using OpenThread which defaults to using the last 4 pages of flash for storing OpenThread-related network data. This means that while using OpenThread under any configuration designed to use mcuboot partition slots, there is no space left over for storage of any kind. Let's adjust the partition table to set storage at 8 pages of flash (32k). This fixes the conflict with OpenThread and leaves room for future use cases that may arise. Signed-off-by: Michael Scott <[email protected]>
1 parent 2153c01 commit 83aa7ce

File tree

12 files changed

+155
-86
lines changed

12 files changed

+155
-86
lines changed

‎boards/arm/bl654_dvk/bl654_dvk.dts‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,19 +153,26 @@
153153
};
154154
slot0_partition: partition@c000 {
155155
label = "image-0";
156-
reg = <0x0000C000 0x000069000>;
156+
reg = <0x0000C000 0x000067000>;
157157
};
158-
slot1_partition: partition@75000 {
158+
slot1_partition: partition@73000 {
159159
label = "image-1";
160-
reg = <0x00075000 0x000069000>;
160+
reg = <0x00073000 0x000067000>;
161161
};
162-
scratch_partition: partition@de000 {
162+
scratch_partition: partition@da000 {
163163
label = "image-scratch";
164-
reg = <0x000de000 0x0001e000>;
164+
reg = <0x000da000 0x0001e000>;
165165
};
166-
storage_partition: partition@fc000 {
166+
167+
/*
168+
* The flash starting at 0x000f8000 and ending at
169+
* 0x000fffff is reserved for use by the application.
170+
*/
171+
172+
/* Storage partition will be used by FCB/NFFS/NVS if enabled. */
173+
storage_partition: partition@f8000 {
167174
label = "storage";
168-
reg = <0x000fc000 0x00004000>;
175+
reg = <0x000f8000 0x00008000>;
169176
};
170177
};
171178
};

‎boards/arm/nrf52840_blip/nrf52840_blip.dts‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,19 +140,26 @@
140140
};
141141
slot0_partition: partition@c000 {
142142
label = "image-0";
143-
reg = <0x0000C000 0x000069000>;
143+
reg = <0x0000C000 0x000067000>;
144144
};
145-
slot1_partition: partition@75000 {
145+
slot1_partition: partition@73000 {
146146
label = "image-1";
147-
reg = <0x00075000 0x000069000>;
147+
reg = <0x00073000 0x000067000>;
148148
};
149-
scratch_partition: partition@de000 {
149+
scratch_partition: partition@da000 {
150150
label = "image-scratch";
151-
reg = <0x000de000 0x0001e000>;
151+
reg = <0x000da000 0x0001e000>;
152152
};
153-
storage_partition: partition@fc000 {
153+
154+
/*
155+
* The flash starting at 0x000f8000 and ending at
156+
* 0x000fffff is reserved for use by the application.
157+
*/
158+
159+
/* Storage partition will be used by FCB/NFFS/NVS if enabled. */
160+
storage_partition: partition@f8000 {
154161
label = "storage";
155-
reg = <0x000fc000 0x00004000>;
162+
reg = <0x000f8000 0x00008000>;
156163
};
157164
};
158165
};

‎boards/arm/nrf52840_mdk/nrf52840_mdk.dts‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,26 @@
113113
};
114114
slot0_partition: partition@c000 {
115115
label = "image-0";
116-
reg = <0x0000C000 0x000069000>;
116+
reg = <0x0000C000 0x000067000>;
117117
};
118-
slot1_partition: partition@75000 {
118+
slot1_partition: partition@73000 {
119119
label = "image-1";
120-
reg = <0x00075000 0x000069000>;
120+
reg = <0x00073000 0x000067000>;
121121
};
122-
scratch_partition: partition@de000 {
122+
scratch_partition: partition@da000 {
123123
label = "image-scratch";
124-
reg = <0x000de000 0x0001e000>;
124+
reg = <0x000da000 0x0001e000>;
125125
};
126-
storage_partition: partition@fc000 {
126+
127+
/*
128+
* The flash starting at 0x000f8000 and ending at
129+
* 0x000fffff is reserved for use by the application.
130+
*/
131+
132+
/* Storage partition will be used by FCB/NFFS/NVS if enabled. */
133+
storage_partition: partition@f8000 {
127134
label = "storage";
128-
reg = <0x000fc000 0x00004000>;
135+
reg = <0x000f8000 0x00008000>;
129136
};
130137
};
131138
};

‎boards/arm/nrf52840_papyr/nrf52840_papyr.dts‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,19 +111,26 @@
111111
};
112112
slot0_partition: partition@c000 {
113113
label = "image-0";
114-
reg = <0x0000C000 0x000069000>;
114+
reg = <0x0000C000 0x000067000>;
115115
};
116-
slot1_partition: partition@75000 {
116+
slot1_partition: partition@73000 {
117117
label = "image-1";
118-
reg = <0x00075000 0x000069000>;
118+
reg = <0x00073000 0x000067000>;
119119
};
120-
scratch_partition: partition@de000 {
120+
scratch_partition: partition@da000 {
121121
label = "image-scratch";
122-
reg = <0x000de000 0x0001e000>;
122+
reg = <0x000da000 0x0001e000>;
123123
};
124-
storage_partition: partition@fc000 {
124+
125+
/*
126+
* The flash starting at 0x000f8000 and ending at
127+
* 0x000fffff is reserved for use by the application.
128+
*/
129+
130+
/* Storage partition will be used by FCB/NFFS/NVS if enabled. */
131+
storage_partition: partition@f8000 {
125132
label = "storage";
126-
reg = <0x000fc000 0x00004000>;
133+
reg = <0x000f8000 0x00008000>;
127134
};
128135
};
129136
};

‎boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,19 +175,26 @@
175175
};
176176
slot0_partition: partition@c000 {
177177
label = "image-0";
178-
reg = <0x0000C000 0x000069000>;
178+
reg = <0x0000C000 0x000067000>;
179179
};
180-
slot1_partition: partition@75000 {
180+
slot1_partition: partition@73000 {
181181
label = "image-1";
182-
reg = <0x00075000 0x000069000>;
182+
reg = <0x00073000 0x000067000>;
183183
};
184-
scratch_partition: partition@de000 {
184+
scratch_partition: partition@da000 {
185185
label = "image-scratch";
186-
reg = <0x000de000 0x0001e000>;
186+
reg = <0x000da000 0x0001e000>;
187187
};
188-
storage_partition: partition@fc000 {
188+
189+
/*
190+
* The flash starting at 0x000f8000 and ending at
191+
* 0x000fffff is reserved for use by the application.
192+
*/
193+
194+
/* Storage partition will be used by FCB/NFFS/NVS if enabled. */
195+
storage_partition: partition@f8000 {
189196
label = "storage";
190-
reg = <0x000fc000 0x00004000>;
197+
reg = <0x000f8000 0x00008000>;
191198
};
192199
};
193200
};

‎boards/arm/nrf52840_pca10090/nrf52840_pca10090.dts‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,26 @@
6464
};
6565
slot0_partition: partition@c000 {
6666
label = "image-0";
67-
reg = <0x0000C000 0x000069000>;
67+
reg = <0x0000C000 0x000067000>;
6868
};
69-
slot1_partition: partition@75000 {
69+
slot1_partition: partition@73000 {
7070
label = "image-1";
71-
reg = <0x00075000 0x000069000>;
71+
reg = <0x00073000 0x000067000>;
7272
};
73-
scratch_partition: partition@de000 {
73+
scratch_partition: partition@da000 {
7474
label = "image-scratch";
75-
reg = <0x000de000 0x0001e000>;
75+
reg = <0x000da000 0x0001e000>;
7676
};
77-
storage_partition: partition@fc000 {
77+
78+
/*
79+
* The flash starting at 0x000f8000 and ending at
80+
* 0x000fffff is reserved for use by the application.
81+
*/
82+
83+
/* Storage partition will be used by FCB/NFFS/NVS if enabled. */
84+
storage_partition: partition@f8000 {
7885
label = "storage";
79-
reg = <0x000fc000 0x00004000>;
86+
reg = <0x000f8000 0x00008000>;
8087
};
8188
};
8289
};

‎boards/arm/particle_argon/mesh_feather.dtsi‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,26 @@
8080
};
8181
slot0_partition: partition@c000 {
8282
label = "image-0";
83-
reg = <0x0000C000 0x000069000>;
83+
reg = <0x0000C000 0x000067000>;
8484
};
85-
slot1_partition: partition@75000 {
85+
slot1_partition: partition@73000 {
8686
label = "image-1";
87-
reg = <0x00075000 0x000069000>;
87+
reg = <0x00073000 0x000067000>;
8888
};
89-
scratch_partition: partition@de000 {
89+
scratch_partition: partition@da000 {
9090
label = "image-scratch";
91-
reg = <0x000de000 0x0001e000>;
91+
reg = <0x000da000 0x0001e000>;
9292
};
9393

94-
storage_partition: partition@fc000 {
94+
/*
95+
* The flash starting at 0x000f8000 and ending at
96+
* 0x000fffff is reserved for use by the application.
97+
*/
98+
99+
/* Storage partition will be used by FCB/NFFS/NVS if enabled. */
100+
storage_partition: partition@f8000 {
95101
label = "storage";
96-
reg = <0x000fc000 0x00004000>;
102+
reg = <0x000f8000 0x00008000>;
97103
};
98104
};
99105
};

‎boards/arm/particle_boron/mesh_feather.dtsi‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,26 @@
8080
};
8181
slot0_partition: partition@c000 {
8282
label = "image-0";
83-
reg = <0x0000C000 0x000069000>;
83+
reg = <0x0000C000 0x000067000>;
8484
};
85-
slot1_partition: partition@75000 {
85+
slot1_partition: partition@73000 {
8686
label = "image-1";
87-
reg = <0x00075000 0x000069000>;
87+
reg = <0x00073000 0x000067000>;
8888
};
89-
scratch_partition: partition@de000 {
89+
scratch_partition: partition@da000 {
9090
label = "image-scratch";
91-
reg = <0x000de000 0x0001e000>;
91+
reg = <0x000da000 0x0001e000>;
9292
};
9393

94-
storage_partition: partition@fc000 {
94+
/*
95+
* The flash starting at 0x000f8000 and ending at
96+
* 0x000fffff is reserved for use by the application.
97+
*/
98+
99+
/* Storage partition will be used by FCB/NFFS/NVS if enabled. */
100+
storage_partition: partition@f8000 {
95101
label = "storage";
96-
reg = <0x000fc000 0x00004000>;
102+
reg = <0x000f8000 0x00008000>;
97103
};
98104
};
99105
};

‎boards/arm/particle_xenon/mesh_feather.dtsi‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,26 @@
8080
};
8181
slot0_partition: partition@c000 {
8282
label = "image-0";
83-
reg = <0x0000C000 0x000069000>;
83+
reg = <0x0000C000 0x000067000>;
8484
};
85-
slot1_partition: partition@75000 {
85+
slot1_partition: partition@73000 {
8686
label = "image-1";
87-
reg = <0x00075000 0x000069000>;
87+
reg = <0x00073000 0x000067000>;
8888
};
89-
scratch_partition: partition@de000 {
89+
scratch_partition: partition@da000 {
9090
label = "image-scratch";
91-
reg = <0x000de000 0x0001e000>;
91+
reg = <0x000da000 0x0001e000>;
9292
};
9393

94-
storage_partition: partition@fc000 {
94+
/*
95+
* The flash starting at 0x000f8000 and ending at
96+
* 0x000fffff is reserved for use by the application.
97+
*/
98+
99+
/* Storage partition will be used by FCB/NFFS/NVS if enabled. */
100+
storage_partition: partition@f8000 {
95101
label = "storage";
96-
reg = <0x000fc000 0x00004000>;
102+
reg = <0x000f8000 0x00008000>;
97103
};
98104
};
99105
};

‎boards/arm/reel_board/reel_board.dts‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,20 +151,26 @@
151151
};
152152
slot0_partition: partition@c000 {
153153
label = "image-0";
154-
reg = <0x0000C000 0x000069000>;
154+
reg = <0x0000C000 0x000067000>;
155155
};
156-
slot1_partition: partition@75000 {
156+
slot1_partition: partition@73000 {
157157
label = "image-1";
158-
reg = <0x00075000 0x000069000>;
158+
reg = <0x00073000 0x000067000>;
159159
};
160-
scratch_partition: partition@de000 {
160+
scratch_partition: partition@da000 {
161161
label = "image-scratch";
162-
reg = <0x000de000 0x0001e000>;
162+
reg = <0x000da000 0x0001e000>;
163163
};
164164

165-
storage_partition: partition@fc000 {
165+
/*
166+
* The flash starting at 0x000f8000 and ending at
167+
* 0x000fffff is reserved for use by the application.
168+
*/
169+
170+
/* Storage partition will be used by FCB/NFFS/NVS if enabled. */
171+
storage_partition: partition@f8000 {
166172
label = "storage";
167-
reg = <0x000fc000 0x00004000>;
173+
reg = <0x000f8000 0x00008000>;
168174
};
169175
};
170176
};

0 commit comments

Comments
 (0)