Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport v4.0-branch] boards: nxp: fix s26ks512s0 flash write-block-size #81480

Open
wants to merge 1 commit into
base: v4.0-branch
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
ahb-write-wait-unit = <2>;
ahb-write-wait-interval = <20>;
status = "okay";
erase-block-size = <4096>;
erase-block-size = <DT_SIZE_K(256)>;
write-block-size = <16>;

partitions {
Expand All @@ -48,22 +48,22 @@
#size-cells = <1>;
boot_partition: partition@0 {
label = "mcuboot";
reg = <0x00000000 DT_SIZE_K(128)>;
reg = <0x00000000 DT_SIZE_K(256)>;
};
/* The MCUBoot swap-move algorithm uses the last 11 sectors
/* The MCUBoot swap-move algorithm uses the last 2 sectors
* of the primary slot0 for swap status and move.
*/
slot0_partition: partition@20000 {
slot0_partition: partition@40000 {
label = "image-0";
reg = <0x00020000 (DT_SIZE_M(3) + DT_SIZE_K(44))>;
reg = <0x00040000 (DT_SIZE_M(3) + DT_SIZE_K(512))>;
};
slot1_partition: partition@32B000 {
slot1_partition: partition@3C0000 {
label = "image-1";
reg = <0x0032B000 DT_SIZE_M(3)>;
reg = <0x003C0000 DT_SIZE_M(3)>;
};
storage_partition: partition@62B000 {
storage_partition: partition@6C0000 {
label = "storage";
reg = <0x0062B000 (DT_SIZE_M(58) - DT_SIZE_K(172))>;
reg = <0x006C0000 (DT_SIZE_M(58) - DT_SIZE_K(768))>;
};
};
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
ahb-write-wait-unit = <2>;
ahb-write-wait-interval = <20>;
status = "okay";
erase-block-size = <4096>;
erase-block-size = <DT_SIZE_K(256)>;
write-block-size = <16>;

partitions {
Expand All @@ -46,22 +46,22 @@
#size-cells = <1>;
boot_partition: partition@0 {
label = "mcuboot";
reg = <0x00000000 DT_SIZE_K(128)>;
reg = <0x00000000 DT_SIZE_K(256)>;
};
/* The MCUBoot swap-move algorithm uses the last 11 sectors
/* The MCUBoot swap-move algorithm uses the last 2 sectors
* of the primary slot0 for swap status and move.
*/
slot0_partition: partition@20000 {
slot0_partition: partition@40000 {
label = "image-0";
reg = <0x00020000 (DT_SIZE_M(3) + DT_SIZE_K(44))>;
reg = <0x00040000 (DT_SIZE_M(3) + DT_SIZE_K(512))>;
};
slot1_partition: partition@32B000 {
slot1_partition: partition@3C0000 {
label = "image-1";
reg = <0x0032B000 DT_SIZE_M(3)>;
reg = <0x003C0000 DT_SIZE_M(3)>;
};
storage_partition: partition@62B000 {
storage_partition: partition@6C0000 {
label = "storage";
reg = <0x0062B000 (DT_SIZE_M(58) - DT_SIZE_K(172))>;
reg = <0x006C0000 (DT_SIZE_M(58) - DT_SIZE_K(768))>;
};
};
};
Expand Down
18 changes: 9 additions & 9 deletions boards/nxp/mimxrt1062_fmurt6/mimxrt1062_fmurt6.dts
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
ahb-write-wait-unit = <2>;
ahb-write-wait-interval = <20>;
status = "okay";
erase-block-size = <4096>;
erase-block-size = <DT_SIZE_K(256)>;
write-block-size = <16>;

partitions {
Expand All @@ -209,22 +209,22 @@
#size-cells = <1>;
boot_partition: partition@0 {
label = "mcuboot";
reg = <0x00000000 DT_SIZE_K(128)>;
reg = <0x00000000 DT_SIZE_K(256)>;
};
/* The MCUBoot swap-move algorithm uses the last 11 sectors
/* The MCUBoot swap-move algorithm uses the last 2 sectors
* of the primary slot0 for swap status and move.
*/
slot0_partition: partition@20000 {
slot0_partition: partition@40000 {
label = "image-0";
reg = <0x00020000 (DT_SIZE_M(3) + DT_SIZE_K(44))>;
reg = <0x00040000 (DT_SIZE_M(3) + DT_SIZE_K(512))>;
};
slot1_partition: partition@32B000 {
slot1_partition: partition@3C0000 {
label = "image-1";
reg = <0x0032B000 DT_SIZE_M(3)>;
reg = <0x003C0000 DT_SIZE_M(3)>;
};
storage_partition: partition@62B000 {
storage_partition: partition@6C0000 {
label = "storage";
reg = <0x0062B000 (DT_SIZE_M(58) - DT_SIZE_K(172))>;
reg = <0x006C0000 (DT_SIZE_M(58) - DT_SIZE_K(768))>;
};
};
};
Expand Down
Loading