Skip to content

Commit 371e3a6

Browse files
butokmmahadevan108
authored andcommitted
boards: nxp: fix s26ks512s0 flash write-block-size
- Sets s26ks512s0 flash write-block-size to correct 256KB. - Optimizes MCUboot partitions to fit the correct write-block-size. Fixes #80284 Signed-off-by: Andrej Butok <[email protected]> (cherry picked from commit a730d9a)
1 parent 07a0ae1 commit 371e3a6

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.overlay

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
ahb-write-wait-unit = <2>;
4040
ahb-write-wait-interval = <20>;
4141
status = "okay";
42-
erase-block-size = <4096>;
42+
erase-block-size = <DT_SIZE_K(256)>;
4343
write-block-size = <16>;
4444

4545
partitions {
@@ -48,22 +48,22 @@
4848
#size-cells = <1>;
4949
boot_partition: partition@0 {
5050
label = "mcuboot";
51-
reg = <0x00000000 DT_SIZE_K(128)>;
51+
reg = <0x00000000 DT_SIZE_K(256)>;
5252
};
53-
/* The MCUBoot swap-move algorithm uses the last 11 sectors
53+
/* The MCUBoot swap-move algorithm uses the last 2 sectors
5454
* of the primary slot0 for swap status and move.
5555
*/
56-
slot0_partition: partition@20000 {
56+
slot0_partition: partition@40000 {
5757
label = "image-0";
58-
reg = <0x00020000 (DT_SIZE_M(3) + DT_SIZE_K(44))>;
58+
reg = <0x00040000 (DT_SIZE_M(3) + DT_SIZE_K(512))>;
5959
};
60-
slot1_partition: partition@32B000 {
60+
slot1_partition: partition@3C0000 {
6161
label = "image-1";
62-
reg = <0x0032B000 DT_SIZE_M(3)>;
62+
reg = <0x003C0000 DT_SIZE_M(3)>;
6363
};
64-
storage_partition: partition@62B000 {
64+
storage_partition: partition@6C0000 {
6565
label = "storage";
66-
reg = <0x0062B000 (DT_SIZE_M(58) - DT_SIZE_K(172))>;
66+
reg = <0x006C0000 (DT_SIZE_M(58) - DT_SIZE_K(768))>;
6767
};
6868
};
6969
};

boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.overlay

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
ahb-write-wait-unit = <2>;
3838
ahb-write-wait-interval = <20>;
3939
status = "okay";
40-
erase-block-size = <4096>;
40+
erase-block-size = <DT_SIZE_K(256)>;
4141
write-block-size = <16>;
4242

4343
partitions {
@@ -46,22 +46,22 @@
4646
#size-cells = <1>;
4747
boot_partition: partition@0 {
4848
label = "mcuboot";
49-
reg = <0x00000000 DT_SIZE_K(128)>;
49+
reg = <0x00000000 DT_SIZE_K(256)>;
5050
};
51-
/* The MCUBoot swap-move algorithm uses the last 11 sectors
51+
/* The MCUBoot swap-move algorithm uses the last 2 sectors
5252
* of the primary slot0 for swap status and move.
5353
*/
54-
slot0_partition: partition@20000 {
54+
slot0_partition: partition@40000 {
5555
label = "image-0";
56-
reg = <0x00020000 (DT_SIZE_M(3) + DT_SIZE_K(44))>;
56+
reg = <0x00040000 (DT_SIZE_M(3) + DT_SIZE_K(512))>;
5757
};
58-
slot1_partition: partition@32B000 {
58+
slot1_partition: partition@3C0000 {
5959
label = "image-1";
60-
reg = <0x0032B000 DT_SIZE_M(3)>;
60+
reg = <0x003C0000 DT_SIZE_M(3)>;
6161
};
62-
storage_partition: partition@62B000 {
62+
storage_partition: partition@6C0000 {
6363
label = "storage";
64-
reg = <0x0062B000 (DT_SIZE_M(58) - DT_SIZE_K(172))>;
64+
reg = <0x006C0000 (DT_SIZE_M(58) - DT_SIZE_K(768))>;
6565
};
6666
};
6767
};

boards/nxp/mimxrt1062_fmurt6/mimxrt1062_fmurt6.dts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
ahb-write-wait-unit = <2>;
201201
ahb-write-wait-interval = <20>;
202202
status = "okay";
203-
erase-block-size = <4096>;
203+
erase-block-size = <DT_SIZE_K(256)>;
204204
write-block-size = <16>;
205205

206206
partitions {
@@ -209,22 +209,22 @@
209209
#size-cells = <1>;
210210
boot_partition: partition@0 {
211211
label = "mcuboot";
212-
reg = <0x00000000 DT_SIZE_K(128)>;
212+
reg = <0x00000000 DT_SIZE_K(256)>;
213213
};
214-
/* The MCUBoot swap-move algorithm uses the last 11 sectors
214+
/* The MCUBoot swap-move algorithm uses the last 2 sectors
215215
* of the primary slot0 for swap status and move.
216216
*/
217-
slot0_partition: partition@20000 {
217+
slot0_partition: partition@40000 {
218218
label = "image-0";
219-
reg = <0x00020000 (DT_SIZE_M(3) + DT_SIZE_K(44))>;
219+
reg = <0x00040000 (DT_SIZE_M(3) + DT_SIZE_K(512))>;
220220
};
221-
slot1_partition: partition@32B000 {
221+
slot1_partition: partition@3C0000 {
222222
label = "image-1";
223-
reg = <0x0032B000 DT_SIZE_M(3)>;
223+
reg = <0x003C0000 DT_SIZE_M(3)>;
224224
};
225-
storage_partition: partition@62B000 {
225+
storage_partition: partition@6C0000 {
226226
label = "storage";
227-
reg = <0x0062B000 (DT_SIZE_M(58) - DT_SIZE_K(172))>;
227+
reg = <0x006C0000 (DT_SIZE_M(58) - DT_SIZE_K(768))>;
228228
};
229229
};
230230
};

0 commit comments

Comments
 (0)