[bootlin/training-materials updates] master: bootloaders: stm: Improve the dia figure (48efe9b5)
Miquel Raynal
miquel.raynal at bootlin.com
Wed Aug 14 13:18:37 CEST 2024
Repository : https://github.com/bootlin/training-materials
On branch : master
Link : https://github.com/bootlin/training-materials/commit/48efe9b538241b581b4c11222a7885edbd039668
>---------------------------------------------------------------
commit 48efe9b538241b581b4c11222a7885edbd039668
Author: Miquel Raynal <miquel.raynal at bootlin.com>
Date: Wed Jul 17 11:21:50 2024 +0200
bootloaders: stm: Improve the dia figure
The fip.bin file contains several subparts which are worth explaining
and grouping:
- The firmware configuration is what is parsed first by BL2 and
describes what is in the FIP, it keeps the next stage bootloaders BL3X
independent from BL2.
- The Trusted OS and its hardware description should be grouped
- U-Boot and its device tree should be grouped.
Source: https://wiki.st.com/stm32mpu/wiki/How_to_configure_TF-A_FW_CONFIG
Signed-off-by: Miquel Raynal <miquel.raynal at bootlin.com>
>---------------------------------------------------------------
48efe9b538241b581b4c11222a7885edbd039668
slides/sysdev-bootloaders-tf-a/stm32mp1-tfa.dia | 169 +++++++++++++-----------
1 file changed, 94 insertions(+), 75 deletions(-)
diff --git a/slides/sysdev-bootloaders-tf-a/stm32mp1-tfa.dia b/slides/sysdev-bootloaders-tf-a/stm32mp1-tfa.dia
index f4a7d593..35599db8 100644
--- a/slides/sysdev-bootloaders-tf-a/stm32mp1-tfa.dia
+++ b/slides/sysdev-bootloaders-tf-a/stm32mp1-tfa.dia
@@ -59,11 +59,18 @@
<dia:color val="#d8e5e5ff"/>
</dia:attribute>
<dia:attribute name="guides">
- <dia:composite type="guides">
- <dia:attribute name="hguides"/>
- <dia:attribute name="vguides"/>
+ <dia:composite type="guide">
+ <dia:attribute name="position">
+ <dia:real val="0"/>
+ </dia:attribute>
+ <dia:attribute name="orientation">
+ <dia:int val="0"/>
+ </dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="guide_color">
+ <dia:color val="#00ff00ff"/>
+ </dia:attribute>
<dia:attribute name="display">
<dia:composite type="display">
<dia:attribute name="antialiased">
@@ -72,18 +79,26 @@
<dia:attribute name="snap-to-grid">
<dia:boolean val="false"/>
</dia:attribute>
+ <dia:attribute name="snap-to-guides">
+ <dia:boolean val="true"/>
+ </dia:attribute>
<dia:attribute name="snap-to-object">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="show-grid">
<dia:boolean val="true"/>
</dia:attribute>
+ <dia:attribute name="show-guides">
+ <dia:boolean val="true"/>
+ </dia:attribute>
<dia:attribute name="show-connection-points">
<dia:boolean val="true"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
</dia:diagramdata>
+ <dia:layer name="Background" visible="true" connectable="false"/>
+ <dia:layer name="Background" visible="true" connectable="false"/>
<dia:layer name="Background" visible="true" connectable="true" active="true">
<dia:object type="Standard - Box" version="0" id="O0">
<dia:attribute name="obj_pos">
@@ -119,7 +134,7 @@
<dia:point val="24,10"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="22.3425,9.01443;25.6575,10"/>
+ <dia:rectangle val="22.4812,8.8425;25.5188,10"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -133,7 +148,7 @@
<dia:real val="1.0583332926034927"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="24,9.80032"/>
+ <dia:point val="24,9.75"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -327,7 +342,7 @@
<dia:point val="24,13"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="20.675,12.6275;27.325,13.3725"/>
+ <dia:rectangle val="20.8725,12.5625;27.1275,13.4375"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -341,7 +356,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="24,13.2216"/>
+ <dia:point val="24,13.2475"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -363,7 +378,7 @@
<dia:point val="24,17"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="20.675,16.6275;27.325,17.3725"/>
+ <dia:rectangle val="20.8725,16.5625;27.1275,17.4375"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -377,7 +392,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="24,17.2216"/>
+ <dia:point val="24,17.2475"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -399,7 +414,7 @@
<dia:point val="24,24"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="21.045,23.6275;26.955,24.3725"/>
+ <dia:rectangle val="21.2087,23.5625;26.7912,24.4375"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -413,7 +428,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="24,24.2216"/>
+ <dia:point val="24,24.2475"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -534,7 +549,7 @@
<dia:point val="17,13"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="6.99,12.6275;17,13.3725"/>
+ <dia:rectangle val="6.99,12.6263;17,13.3738"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -548,7 +563,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="17,13.2216"/>
+ <dia:point val="17,13.2213"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -567,7 +582,7 @@
<dia:point val="17,23"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="14.305,22.6275;17,23.3725"/>
+ <dia:rectangle val="14.305,22.6262;17,23.3737"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -581,7 +596,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="17,23.2216"/>
+ <dia:point val="17,23.2212"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -600,7 +615,7 @@
<dia:point val="17,17"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="6.99,16.6275;17,17.3725"/>
+ <dia:rectangle val="6.99,16.6262;17,17.3737"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -614,7 +629,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="17,17.2216"/>
+ <dia:point val="17,17.2212"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -659,13 +674,13 @@
</dia:object>
<dia:object type="Standard - Box" version="0" id="O21">
<dia:attribute name="obj_pos">
- <dia:point val="38,8"/>
+ <dia:point val="38,14.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="37.95,7.95;45.05,10.05"/>
+ <dia:rectangle val="37.95,14.05;45.05,16.15"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="38,8"/>
+ <dia:point val="38,14.1"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="7"/>
@@ -688,13 +703,13 @@
</dia:object>
<dia:object type="Standard - Box" version="0" id="O22">
<dia:attribute name="obj_pos">
- <dia:point val="38,10"/>
+ <dia:point val="38,8.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="37.95,9.95;45.05,16.05"/>
+ <dia:rectangle val="37.95,8.05;45.05,14.15"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="38,10"/>
+ <dia:point val="38,8.1"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="7"/>
@@ -751,13 +766,13 @@
<dia:point val="29,15"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="28.95,14.95;38,16.3618"/>
+ <dia:rectangle val="28.95,14.95;38,16.4618"/>
</dia:attribute>
<dia:attribute name="bez_points">
<dia:point val="29,15"/>
<dia:point val="34.644,15"/>
- <dia:point val="32.356,16"/>
- <dia:point val="38,16"/>
+ <dia:point val="32.356,16.1"/>
+ <dia:point val="38,16.1"/>
</dia:attribute>
<dia:attribute name="corner_types">
<dia:enum val="0"/>
@@ -774,7 +789,7 @@
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O0" connection="7"/>
- <dia:connection handle="3" to="O22" connection="5"/>
+ <dia:connection handle="3" to="O21" connection="5"/>
</dia:connections>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O25">
@@ -782,7 +797,7 @@
<dia:point val="41.5,7"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="38.2675,6.2275;44.7325,7.7725"/>
+ <dia:rectangle val="38.4688,6.1625;44.5312,7.8375"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -797,7 +812,7 @@ to STM32 ROM code#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="41.5,6.82156"/>
+ <dia:point val="41.5,6.8475"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -816,10 +831,10 @@ to STM32 ROM code#</dia:string>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O26">
<dia:attribute name="obj_pos">
- <dia:point val="41.5,9"/>
+ <dia:point val="41.5,15.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="39.0922,8.2275;43.9078,9.7725"/>
+ <dia:rectangle val="39.2612,14.2625;43.7387,15.9375"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -834,7 +849,7 @@ TF-A itself#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="41.5,8.82156"/>
+ <dia:point val="41.5,14.9475"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -853,10 +868,10 @@ TF-A itself#</dia:string>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O27">
<dia:attribute name="obj_pos">
- <dia:point val="41.5,13"/>
+ <dia:point val="41.5,11.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="39.9188,12.2275;43.0813,13.7725"/>
+ <dia:rectangle val="40.0412,10.2625;42.9587,11.9375"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -871,7 +886,7 @@ TF-A itself#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="41.5,12.8216"/>
+ <dia:point val="41.5,10.9475"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -890,13 +905,13 @@ TF-A itself#</dia:string>
</dia:object>
<dia:object type="Standard - Box" version="0" id="O28">
<dia:attribute name="obj_pos">
- <dia:point val="38,17"/>
+ <dia:point val="38,20.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="37.95,16.95;45.05,19.05"/>
+ <dia:rectangle val="37.95,20.2;45.05,22.3"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="38,17"/>
+ <dia:point val="38,20.25"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="7"/>
@@ -919,13 +934,13 @@ TF-A itself#</dia:string>
</dia:object>
<dia:object type="Standard - Box" version="0" id="O29">
<dia:attribute name="obj_pos">
- <dia:point val="38,19"/>
+ <dia:point val="38,24.35"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="37.95,18.95;45.05,23.05"/>
+ <dia:rectangle val="37.95,24.3;45.05,28.4"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="38,19"/>
+ <dia:point val="38,24.35"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="7"/>
@@ -948,13 +963,13 @@ TF-A itself#</dia:string>
</dia:object>
<dia:object type="Standard - Box" version="0" id="O30">
<dia:attribute name="obj_pos">
- <dia:point val="38,22.7"/>
+ <dia:point val="38,18.15"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="37.95,22.65;45.05,24.75"/>
+ <dia:rectangle val="37.95,18.1;45.05,20.2"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="38,22.7"/>
+ <dia:point val="38,18.15"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="7"/>
@@ -977,10 +992,10 @@ TF-A itself#</dia:string>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O31">
<dia:attribute name="obj_pos">
- <dia:point val="41.5,18"/>
+ <dia:point val="41.5,21.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="39.84,17.2275;43.16,18.7725"/>
+ <dia:rectangle val="39.9763,20.4125;43.0237,22.0875"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -995,7 +1010,7 @@ TF-A itself#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="41.5,17.8216"/>
+ <dia:point val="41.5,21.0975"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -1014,10 +1029,10 @@ TF-A itself#</dia:string>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O32">
<dia:attribute name="obj_pos">
- <dia:point val="41.5,21"/>
+ <dia:point val="41.5,26.35"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="40.425,20.2275;42.575,21.7725"/>
+ <dia:rectangle val="40.4537,25.5125;42.5463,27.1875"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1032,7 +1047,7 @@ TF-A itself#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="41.5,20.8216"/>
+ <dia:point val="41.5,26.1975"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -1051,10 +1066,10 @@ TF-A itself#</dia:string>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O33">
<dia:attribute name="obj_pos">
- <dia:point val="41.5,23.75"/>
+ <dia:point val="41.5,19.15"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="38.5763,22.9775;44.4237,24.5225"/>
+ <dia:rectangle val="38.725,18.3125;44.275,19.9875"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1069,7 +1084,7 @@ TF-A itself#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="41.5,23.5716"/>
+ <dia:point val="41.5,18.9975"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -1082,16 +1097,19 @@ TF-A itself#</dia:string>
<dia:attribute name="valign">
<dia:enum val="2"/>
</dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O30" connection="8"/>
+ </dia:connections>
</dia:object>
<dia:object type="Standard - Box" version="0" id="O34">
<dia:attribute name="obj_pos">
- <dia:point val="38,24.65"/>
+ <dia:point val="38,28.35"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="37.95,24.6;45.05,26.55"/>
+ <dia:rectangle val="37.95,28.3;45.05,30.25"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="38,24.65"/>
+ <dia:point val="38,28.35"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="7"/>
@@ -1114,10 +1132,10 @@ TF-A itself#</dia:string>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O35">
<dia:attribute name="obj_pos">
- <dia:point val="41.5,25.575"/>
+ <dia:point val="41.5,29.275"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="38.4575,24.8025;44.5425,26.3475"/>
+ <dia:rectangle val="38.6512,28.4375;44.3487,30.1125"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1132,7 +1150,7 @@ TF-A itself#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="41.5,25.3966"/>
+ <dia:point val="41.5,29.1225"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -1151,19 +1169,19 @@ TF-A itself#</dia:string>
</dia:object>
<dia:object type="Standard - Box" version="0" id="O36">
<dia:attribute name="obj_pos">
- <dia:point val="38,26.5"/>
+ <dia:point val="38,22.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="37.95,26.45;45.05,28.05"/>
+ <dia:rectangle val="37.95,22.2;45.05,24.3"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="38,26.5"/>
+ <dia:point val="38,22.25"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="7"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="1.5"/>
+ <dia:real val="1.9999999999999467"/>
</dia:attribute>
<dia:attribute name="border_width">
<dia:real val="0.10000000149011612"/>
@@ -1180,15 +1198,16 @@ TF-A itself#</dia:string>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O37">
<dia:attribute name="obj_pos">
- <dia:point val="41.5,27.25"/>
+ <dia:point val="41.5,23.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="38.7287,26.8775;44.2712,27.6225"/>
+ <dia:rectangle val="38.4712,22.4125;44.5287,24.0875"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#TOS_HW_CONFIG#</dia:string>
+ <dia:string>#BL32 hardware desc
+(TOS_HW_CONFIG)#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="0" name="Helvetica"/>
@@ -1197,7 +1216,7 @@ TF-A itself#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="41.5,27.4716"/>
+ <dia:point val="41.5,23.0975"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
@@ -1219,13 +1238,13 @@ TF-A itself#</dia:string>
<dia:point val="29,19"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="28.95,16.6382;38,19.05"/>
+ <dia:rectangle val="28.95,17.7882;38,19.05"/>
</dia:attribute>
<dia:attribute name="bez_points">
<dia:point val="29,19"/>
<dia:point val="32.652,19"/>
- <dia:point val="34.348,17"/>
- <dia:point val="38,17"/>
+ <dia:point val="34.348,18.15"/>
+ <dia:point val="38,18.15"/>
</dia:attribute>
<dia:attribute name="corner_types">
<dia:enum val="0"/>
@@ -1242,7 +1261,7 @@ TF-A itself#</dia:string>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O2" connection="7"/>
- <dia:connection handle="3" to="O28" connection="0"/>
+ <dia:connection handle="3" to="O30" connection="0"/>
</dia:connections>
</dia:object>
<dia:object type="Standard - BezierLine" version="0" id="O39">
@@ -1250,13 +1269,13 @@ TF-A itself#</dia:string>
<dia:point val="29,29"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="28.95,27.6382;38,29.05"/>
+ <dia:rectangle val="28.95,28.95;38,30.5618"/>
</dia:attribute>
<dia:attribute name="bez_points">
<dia:point val="29,29"/>
<dia:point val="32.652,29"/>
- <dia:point val="34.348,28"/>
- <dia:point val="38,28"/>
+ <dia:point val="34.348,30.2"/>
+ <dia:point val="38,30.2"/>
</dia:attribute>
<dia:attribute name="corner_types">
<dia:enum val="0"/>
@@ -1273,7 +1292,7 @@ TF-A itself#</dia:string>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O3" connection="7"/>
- <dia:connection handle="3" to="O36" connection="5"/>
+ <dia:connection handle="3" to="O34" connection="5"/>
</dia:connections>
</dia:object>
</dia:layer>
More information about the training-materials-updates
mailing list