Skip to content
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
8 changes: 2 additions & 6 deletions boards/st/b_u585i_iot02a/b_u585i_iot02a.dts
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,10 @@
slot1_partition: partition@78000 {
compatible = "zephyr,mapped-partition";
label = "image-1";
reg = <0x00078000 DT_SIZE_K(416)>;
reg = <0x00078000 DT_SIZE_K(420)>;
};

scratch_partition: partition@e0000 {
compatible = "zephyr,mapped-partition";
label = "image-scratch";
reg = <0x000e0000 DT_SIZE_K(64)>;
};
/* Unused range [0xe1000..0xeffff] */

storage_partition: partition@f0000 {
compatible = "zephyr,mapped-partition";
Expand Down
6 changes: 6 additions & 0 deletions boards/st/nucleo_f207zg/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# SPDX-FileCopyrightText: Copyright STMicroelectronics
# SPDX-License-Identifier: Apache-2.0

choice MCUBOOT_MODE
default MCUBOOT_MODE_SWAP_SCRATCH if BOOTLOADER_MCUBOOT
endchoice
20 changes: 15 additions & 5 deletions boards/st/nucleo_f207zg/nucleo_f207zg.dts
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ zephyr_udc0: &usbotg_fs {
#size-cells = <1>;
ranges;

/* Sectors 0 and 1 (2x16kByte) */
boot_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "mcuboot";
Expand All @@ -241,10 +242,14 @@ zephyr_udc0: &usbotg_fs {
};

/*
* Sectors 2 and 3 (2x16kByte)
*
* nvs subsystem requires 2 sectors with a max total of 32K
* On F2 series, the only option is to use the following
* partition, which is compatible with mcuboot usage.
* Keep it commented in order it is not used by CI.
* Keep it commented in order it is not used by CI
* since, when MCUBoot is not embedded, Zephyr image starts
* from flash0 beginning and overlaps storage_partition.
*
* storage_partition: partition@8000 {
* compatible = "zephyr,mapped-partition";
Expand All @@ -253,22 +258,27 @@ zephyr_udc0: &usbotg_fs {
* };
*/

/* Sector 4 (64kByte): spare/unused */

/* Sectors 5 to 7 (3x128kByte) */
slot0_partition: partition@20000 {
compatible = "zephyr,mapped-partition";
label = "image-0";
reg = <0x20000 DT_SIZE_K(384)>;
};

slot1_partition: partition@60000 {
/* Sectors 8 to 10 (3x128kByte) */
slot1_partition: partition@80000 {
compatible = "zephyr,mapped-partition";
label = "image-1";
reg = <0x60000 DT_SIZE_K(384)>;
reg = <0x80000 DT_SIZE_K(384)>;
};

scratch_partition: partiimagtion@c0000 {
/* Sector 11 (128kByte) */
scratch_partition: partition@e0000 {
compatible = "zephyr,mapped-partition";
label = "image-scratch";
reg = <0xc0000 DT_SIZE_K(128)>;
reg = <0xe0000 DT_SIZE_K(128)>;
};
};
};
Expand Down
6 changes: 6 additions & 0 deletions boards/st/nucleo_f401re/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# SPDX-FileCopyrightText: Copyright STMicroelectronics
# SPDX-License-Identifier: Apache-2.0

choice MCUBOOT_MODE
default MCUBOOT_MODE_SWAP_SCRATCH if BOOTLOADER_MCUBOOT
endchoice
6 changes: 6 additions & 0 deletions boards/st/nucleo_f410rb/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# SPDX-FileCopyrightText: Copyright STMicroelectronics
# SPDX-License-Identifier: Apache-2.0

choice MCUBOOT_MODE
default MCUBOOT_MODE_OVERWRITE_ONLY if BOOTLOADER_MCUBOOT
endchoice
18 changes: 4 additions & 14 deletions boards/st/nucleo_f410rb/nucleo_f410rb.dts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
zephyr,shell-uart = &usart2;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
};

leds: leds {
Expand Down Expand Up @@ -131,37 +132,26 @@
#size-cells = <1>;
ranges;

/* Sectors 0 & 1 (2x16kB) */
boot_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "mcuboot";
reg = <0x00000000 DT_SIZE_K(32)>;
read-only;
};

/*
* The flash sectors 2&3 at 0x00008000 and ending at
* 0x0000ffff
*/
/* Sectors 2 & 3 (2x16kB) */
slot0_partition: partition@8000 {
compatible = "zephyr,mapped-partition";
label = "image-0";
reg = <0x00008000 DT_SIZE_K(32)>;
};

/*
* The flash sectors 4 at 0x00010000 and ending at
* 0x001ffff
*/
/* Sectors 4 (only the first 32kB) */
slot1_partition: partition@10000 {
compatible = "zephyr,mapped-partition";
label = "image-1";
reg = <0x00010000 DT_SIZE_K(32)>;
};

scratch_partition: partition@18000 {
compatible = "zephyr,mapped-partition";
label = "image-scratch";
reg = <0x00018000 DT_SIZE_K(32)>;
};
};
};
6 changes: 6 additions & 0 deletions boards/st/nucleo_f413zh/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# SPDX-FileCopyrightText: Copyright STMicroelectronics
# SPDX-License-Identifier: Apache-2.0

choice MCUBOOT_MODE
default MCUBOOT_MODE_SWAP_SCRATCH if BOOTLOADER_MCUBOOT
endchoice
6 changes: 6 additions & 0 deletions boards/st/nucleo_f429zi/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# SPDX-FileCopyrightText: Copyright STMicroelectronics
# SPDX-License-Identifier: Apache-2.0

choice MCUBOOT_MODE
default MCUBOOT_MODE_SWAP_SCRATCH if BOOTLOADER_MCUBOOT
endchoice
6 changes: 6 additions & 0 deletions boards/st/nucleo_f446re/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# SPDX-FileCopyrightText: Copyright STMicroelectronics
# SPDX-License-Identifier: Apache-2.0

choice MCUBOOT_MODE
default MCUBOOT_MODE_SWAP_SCRATCH if BOOTLOADER_MCUBOOT
endchoice
19 changes: 11 additions & 8 deletions boards/st/nucleo_f446re/nucleo_f446re.dts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/*
* Copyright (c) 2018 Philémon Jaermann
*
Expand All @@ -21,6 +21,7 @@
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,canbus = &can2;
zephyr,code-partition = &slot0_partition;
};

leds: leds {
Expand Down Expand Up @@ -101,8 +102,8 @@
&i2c1 {
pinctrl-0 = <&i2c1_scl_pb8 &i2c1_sda_pb9>;
pinctrl-names = "default";
scl-gpios = <&gpiob 8 GPIO_ACTIVE_HIGH>;

Check failure on line 105 in boards/st/nucleo_f446re/nucleo_f446re.dts

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

boards/st/nucleo_f446re/nucleo_f446re.dts:105 Property is redefined in same closure. Delete property See https://docs.zephyrproject.org/latest/contribute/style/devicetree.html for more details.
sda-gpios = <&gpiob 9 GPIO_ACTIVE_HIGH>;

Check failure on line 106 in boards/st/nucleo_f446re/nucleo_f446re.dts

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

boards/st/nucleo_f446re/nucleo_f446re.dts:106 Property is redefined in same closure. Delete property See https://docs.zephyrproject.org/latest/contribute/style/devicetree.html for more details.
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
scl-gpios = <&gpiob 8 GPIO_ACTIVE_HIGH>;
Expand Down Expand Up @@ -173,36 +174,38 @@
#size-cells = <1>;
ranges;

/* Sectors 0 and 1 (2x16kByte) */
boot_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "mcuboot";
reg = <0x00000000 DT_SIZE_K(64)>;
reg = <0x00000000 DT_SIZE_K(32)>;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you will need to verify if MCUboot with its default config fits in 32KB, otherwise will need to add a SoC-specific MCUboot conf with certain non-essential things disabled.

read-only;
};

/*
* The flash starting at 0x00010000 and ending at
* 0x0001ffff (sectors 16-31) is reserved for use
* by the application.
*/
storage_partition: partition@10000 {
/* Sectors 2 and 3 (2x16kByte) */
storage_partition: partition@8000 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x00010000 DT_SIZE_K(64)>;
reg = <0x00008000 DT_SIZE_K(32)>;
};

/* Sector 4 (64kByte): spare/unused */

/* Sector 5 (128kByte) */
slot0_partition: partition@20000 {
compatible = "zephyr,mapped-partition";
label = "image-0";
reg = <0x00020000 DT_SIZE_K(128)>;
};

/* Sector 6 (128kByte) */
slot1_partition: partition@40000 {
compatible = "zephyr,mapped-partition";
label = "image-1";
reg = <0x00040000 DT_SIZE_K(128)>;
};

/* Sector 7 (128kByte) */
scratch_partition: partition@60000 {
compatible = "zephyr,mapped-partition";
label = "image-scratch";
Expand Down
6 changes: 6 additions & 0 deletions boards/st/nucleo_f446ze/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# SPDX-FileCopyrightText: Copyright STMicroelectronics
# SPDX-License-Identifier: Apache-2.0

choice MCUBOOT_MODE
default MCUBOOT_MODE_SWAP_SCRATCH if BOOTLOADER_MCUBOOT
endchoice
19 changes: 11 additions & 8 deletions boards/st/nucleo_f446ze/nucleo_f446ze.dts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,canbus = &can1;
zephyr,code-partition = &slot0_partition;
};

leds: leds {
Expand Down Expand Up @@ -194,36 +195,38 @@ zephyr_udc0: &usbotg_fs {
#size-cells = <1>;
ranges;

/* Sectors 0 and 1 (2x16kByte) */
boot_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "mcuboot";
reg = <0x00000000 DT_SIZE_K(64)>;
reg = <0x00000000 DT_SIZE_K(32)>;
read-only;
};

/*
* The flash starting at 0x00010000 and ending at
* 0x0001ffff (sectors 16-31) is reserved for use
* by the application.
*/
storage_partition: partition@10000 {
/* Sectors 2 and 3 (2x16kByte) */
storage_partition: partition@8000 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x00010000 DT_SIZE_K(64)>;
reg = <0x00008000 DT_SIZE_K(32)>;
};

/* Sector 4 (64kByte): spare/unused */

/* Sector 5 (128kByte) */
slot0_partition: partition@20000 {
compatible = "zephyr,mapped-partition";
label = "image-0";
reg = <0x00020000 DT_SIZE_K(128)>;
};

/* Sector 6 (128kByte) */
slot1_partition: partition@40000 {
compatible = "zephyr,mapped-partition";
label = "image-1";
reg = <0x00040000 DT_SIZE_K(128)>;
};

/* Sector 7 (128kByte) */
scratch_partition: partition@60000 {
compatible = "zephyr,mapped-partition";
label = "image-scratch";
Expand Down
24 changes: 15 additions & 9 deletions boards/st/nucleo_f746zg/nucleo_f746zg.dts
Original file line number Diff line number Diff line change
Expand Up @@ -248,35 +248,41 @@ zephyr_udc0: &usbotg_fs {
#size-cells = <1>;
ranges;

/* set 4* 32KB */
/* Sectors 0 and 1 (2x32kByte) */
boot_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "mcuboot";
reg = <0x00000000 DT_SIZE_K(128)>;
reg = <0x00000000 DT_SIZE_K(64)>;
};

storage_partition: partition@20000 {
/* Sectors 2 and 3 (2x32kByte) */
storage_partition: partition@10000 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x00020000 DT_SIZE_K(256)>;
reg = <0x00010000 DT_SIZE_K(64)>;
};

slot0_partition: partition@60000 {
/* Sector 4 (128kByte): spare/unused */

/* Sectors 5 (256kByte) */
slot0_partition: partition@40000 {
compatible = "zephyr,mapped-partition";
label = "image-0";
reg = <0x00060000 DT_SIZE_K(128)>;
reg = <0x00040000 DT_SIZE_K(256)>;
};

/* Sectors 6 (256kByte) */
slot1_partition: partition@80000 {
compatible = "zephyr,mapped-partition";
label = "image-1";
reg = <0x00080000 DT_SIZE_K(128)>;
reg = <0x00080000 DT_SIZE_K(256)>;
};

scratch_partition: partition@a0000 {
/* Sectors 7 (256kByte) */
scratch_partition: partition@c0000 {
compatible = "zephyr,mapped-partition";
label = "image-scratch";
reg = <0x000a0000 DT_SIZE_K(256)>;
reg = <0x000c0000 DT_SIZE_K(256)>;
};
};
};
Expand Down
6 changes: 6 additions & 0 deletions boards/st/nucleo_f756zg/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# SPDX-FileCopyrightText: Copyright STMicroelectronics
# SPDX-License-Identifier: Apache-2.0

choice MCUBOOT_MODE
default MCUBOOT_MODE_SWAP_SCRATCH if BOOTLOADER_MCUBOOT
endchoice
6 changes: 6 additions & 0 deletions boards/st/nucleo_h743zi/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# SPDX-FileCopyrightText: Copyright STMicroelectronics
# SPDX-License-Identifier: Apache-2.0

choice MCUBOOT_MODE
default MCUBOOT_MODE_SWAP_SCRATCH if BOOTLOADER_MCUBOOT
endchoice
18 changes: 12 additions & 6 deletions boards/st/nucleo_h743zi/nucleo_h743zi.dts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/*
* Copyright (c) 2020 Teslabs Engineering S.L.
*
Expand Down Expand Up @@ -147,8 +147,8 @@
&i2c1 {
pinctrl-0 = <&i2c1_scl_pb8 &i2c1_sda_pb9>;
pinctrl-names = "default";
scl-gpios = <&gpiob 8 GPIO_ACTIVE_HIGH>;

Check failure on line 150 in boards/st/nucleo_h743zi/nucleo_h743zi.dts

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

boards/st/nucleo_h743zi/nucleo_h743zi.dts:150 Property is redefined in same closure. Delete property See https://docs.zephyrproject.org/latest/contribute/style/devicetree.html for more details.
sda-gpios = <&gpiob 9 GPIO_ACTIVE_HIGH>;

Check failure on line 151 in boards/st/nucleo_h743zi/nucleo_h743zi.dts

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

boards/st/nucleo_h743zi/nucleo_h743zi.dts:151 Property is redefined in same closure. Delete property See https://docs.zephyrproject.org/latest/contribute/style/devicetree.html for more details.
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
scl-gpios = <&gpiob 8 GPIO_ACTIVE_HIGH>;
Expand Down Expand Up @@ -262,12 +262,18 @@
read-only;
};

/* storage: 128KB for settings */
storage_partition: partition@20000 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x00020000 DT_SIZE_K(128)>;
};
/* storage: 128KB for settings
*
* NVS needs at least 2 sectors of 32kB each max
* which does not match H743x internal flash whose
* sectors are all 128kB.
*
* storage_partition: partition@20000 {
* compatible = "zephyr,mapped-partition";
* label = "storage";
* reg = <0x00020000 DT_SIZE_K(128)>;
* };
*/

/* application image slot: 256KB */
slot0_partition: partition@40000 {
Expand Down
4 changes: 2 additions & 2 deletions boards/st/sensortile_box/sensortile_box.dts
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,10 @@ zephyr_udc0: &usbotg_fs {
reg = <0x000f8000 DT_SIZE_K(24)>;
};

storage_partition: partition@fc000 {
storage_partition: partition@fe000 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x000fc000 DT_SIZE_K(24)>;
reg = <0x000fe000 DT_SIZE_K(16)>;
};
};
};
Expand Down
Loading
Loading