Skip to content

Commit f376602

Browse files
nandojvekartben
authored andcommitted
west.yml: Bump tf-m with stm32 patches
This brings many tf-m patches related to stm32 SoCs. It sync stm32 with the vendor mainline patches and add all the necessary pieces to allow STM32U5Axxx SoC work with TF-M. The patch list can be checked in: zephyrproject-rtos/trusted-firmware-m#145 In addition, redesign the b_u585i_iot02a flash partitions. The current b_u585i_iot02a NS flash layout difficult the development of large applications. Since there is an external NOR memory which is already supported by tf-m, this proposes a layout reconfiguration which allows bigger bootloader, S and NS software. With this redesign the overlay in the tests can be safely removed. This new layout is synced with TF-M 2.1.1 mainline, see: https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/41126 The bootloader BL2 now will fetch FOTA content from the external memory. Signed-off-by: BUDKE Gerson Fernando <[email protected]>
1 parent 49ed831 commit f376602

File tree

4 files changed

+39
-40
lines changed

4 files changed

+39
-40
lines changed

boards/st/b_u585i_iot02a/b_u585i_iot02a_stm32u585xx_ns.dts

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,44 +34,59 @@
3434

3535
/*
3636
* Following flash partition is compatible with requirements
37-
* given in TFM configuration given for current board.
38-
* It might require adjustment depending on evolutions on TFM.
37+
* given in TF-M configuration given for current board.
38+
*
39+
* It might require adjustment depending on evolutions on TF-M.
3940
*/
40-
4141
boot_partition: partition@0 {
4242
label = "mcuboot";
43-
reg = <0x00000000 DT_SIZE_K(224)>;
43+
reg = <0x00000000 DT_SIZE_K(384)>;
4444
read-only;
4545
};
4646

4747
/* Secure image primary slot */
48-
slot0_partition: partition@38000 {
48+
slot0_partition: partition@60000 {
4949
label = "image-0";
50-
reg = <0x00038000 DT_SIZE_K(384)>;
50+
reg = <0x00060000 DT_SIZE_K(512)>;
5151
};
5252

5353
/* Non-secure image primary slot */
54-
slot0_ns_partition: partition@98000 {
54+
slot0_ns_partition: partition@e0000 {
5555
label = "image-0-nonsecure";
56-
reg = <0x00098000 DT_SIZE_K(512)>;
56+
reg = <0x000e0000 DT_SIZE_K(1024)>;
57+
};
58+
59+
/* Internal Non Volatile Storage */
60+
storage_partition: partition@1e0000 {
61+
label = "storage";
62+
reg = <0x001e0000 DT_SIZE_K(128)>;
5763
};
64+
};
65+
};
66+
67+
&mx25lm51245 {
68+
partitions {
69+
compatible = "fixed-partitions";
70+
#address-cells = <1>;
71+
#size-cells = <1>;
5872

59-
/* Secure image secondary slot */
60-
slot1_partition: partition@118000 {
73+
/*
74+
* The flash partition (0 and 1) are aligned
75+
* with the TF-M flash layout expectation.
76+
*/
77+
slot1_partition: partition@0 {
6178
label = "image-1";
62-
reg = <0x00118000 DT_SIZE_K(384)>;
79+
reg = <0x00000000 DT_SIZE_K(512)>;
6380
};
6481

65-
/* Non-secure image secondary slot */
66-
slot1_ns_partition: partition@178000 {
82+
slot1_ns_partition: partition@80000 {
6783
label = "image-1-nonsecure";
68-
reg = <0x00178000 DT_SIZE_K(512)>;
84+
reg = <0x00080000 DT_SIZE_K(1024)>;
6985
};
7086

71-
/* Applicative Non Volatile Storage */
72-
storage_partition: partition@1f8000 {
73-
label = "storage";
74-
reg = <0x001f8000 DT_SIZE_K(16)>;
87+
external_partition: partition@180000 {
88+
label = "external";
89+
reg = <0x00180000 (DT_SIZE_M(64) - DT_SIZE_K(1024) - DT_SIZE_K(512))>;
7590
};
7691
};
7792
};

doc/releases/migration-guide-4.3.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ Base Libraries
4141
Boards
4242
******
4343

44+
* b_u585i_iot02a/ns: The flash layout was changed to be in sync with the upstream TF-M 2.2.1 board
45+
configurations. The new layout expands the flash partitions, moving the secondary ones to the
46+
external NOR flash. This change currently prevents upgrade from older Zephyr release images to
47+
Zephyr 4.3 release images. More details in the TF-M migration and release notes.
48+
4449
* mimxrt11x0: renamed lpadc1 to lpadc2 and renamed lpadc0 to lpadc1.
4550

4651
* NXP ``frdm_mcxa166`` is renamed to ``frdm_mcxa346``.

tests/drivers/flash/common/boards/b_u585i_iot02a_stm32u585xx_ns.overlay

Lines changed: 0 additions & 21 deletions
This file was deleted.

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ manifest:
364364
groups:
365365
- tee
366366
- name: trusted-firmware-m
367-
revision: cc800268f79779fa674b7085ecf507eb95b83ff9
367+
revision: 3e12b0cc27d828d7ec04c4ac62ad45a9a905573e
368368
path: modules/tee/tf-m/trusted-firmware-m
369369
groups:
370370
- tee

0 commit comments

Comments
 (0)