[bootlin/training-materials updates] master: bootloaders: stm32: Fix TF-A BL numbers (689ab269)

Miquel Raynal miquel.raynal at bootlin.com
Wed Aug 14 13:18:33 CEST 2024


Repository : https://github.com/bootlin/training-materials
On branch  : master
Link       : https://github.com/bootlin/training-materials/commit/689ab269b7546cef44daee3e26aa980050d819b0

>---------------------------------------------------------------

commit 689ab269b7546cef44daee3e26aa980050d819b0
Author: Miquel Raynal <miquel.raynal at bootlin.com>
Date:   Wed Jul 17 18:02:42 2024 +0200

    bootloaders: stm32: Fix TF-A BL numbers
    
    Signed-off-by: Miquel Raynal <miquel.raynal at bootlin.com>


>---------------------------------------------------------------

689ab269b7546cef44daee3e26aa980050d819b0
 common/sequence-stm32mp1.dia                    | 63 +++++++++++++------------
 slides/sysdev-bootloaders-tf-a/stm32mp1-tfa.dia |  7 +--
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/common/sequence-stm32mp1.dia b/common/sequence-stm32mp1.dia
index f08ea7e6..c06d3de1 100644
--- a/common/sequence-stm32mp1.dia
+++ b/common/sequence-stm32mp1.dia
@@ -88,6 +88,7 @@
       </dia:composite>
     </dia:attribute>
   </dia:diagramdata>
+  <dia:layer name="Background" visible="true" connectable="false"/>
   <dia:layer name="Hintergrund" visible="true" connectable="false"/>
   <dia:layer name="Hintergrund" visible="true" connectable="false"/>
   <dia:layer name="Hintergrund" visible="true" connectable="false"/>
@@ -156,7 +157,7 @@
         <dia:point val="16,9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.2263,7.42625;16.7737,10.5738"/>
+        <dia:rectangle val="15.2613,7.3625;16.7387,10.6375"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -173,7 +174,7 @@ BL1#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="16,8.02125"/>
+            <dia:point val="16,8.0475"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -224,7 +225,7 @@ BL1#</dia:string>
         <dia:point val="27,9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.2937,7.82625;27.7063,10.1738"/>
+        <dia:rectangle val="26.3487,7.7625;27.6512,10.2375"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -240,7 +241,7 @@ BL2#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="27,8.42125"/>
+            <dia:point val="27,8.4475"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -262,7 +263,7 @@ BL2#</dia:string>
         <dia:point val="16,4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.7037,4;18.2963,4.7475"/>
+        <dia:rectangle val="13.8262,4;18.1737,4.875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -276,7 +277,7 @@ BL2#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="16,4.595"/>
+            <dia:point val="16,4.685"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -295,7 +296,7 @@ BL2#</dia:string>
         <dia:point val="27,2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.6187,2;30.3812,4.3475"/>
+        <dia:rectangle val="23.81,2;30.19,4.475"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -311,7 +312,7 @@ or fsbl2#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="27,2.595"/>
+            <dia:point val="27,2.685"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -330,7 +331,7 @@ or fsbl2#</dia:string>
         <dia:point val="39,2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="35.6187,2;42.3813,3.5475"/>
+        <dia:rectangle val="35.81,2;42.19,3.675"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -345,7 +346,7 @@ partition called fip#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="39,2.595"/>
+            <dia:point val="39,2.685"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -480,7 +481,7 @@ partition called fip#</dia:string>
         <dia:point val="39,17"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.925,15.8262;40.075,18.1737"/>
+        <dia:rectangle val="37.9537,15.7625;40.0463,18.2375"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -496,7 +497,7 @@ BL33#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="39,16.4213"/>
+            <dia:point val="39,16.4475"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -556,7 +557,7 @@ BL33#</dia:string>
           <dia:point val="50,17"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="49.0138,16.2263;50.9862,17.7737"/>
+          <dia:rectangle val="49.0562,16.1625;50.9438,17.8375"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -571,7 +572,7 @@ kernel#</dia:string>
               <dia:real val="0.80000000000000004"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="50,16.8212"/>
+              <dia:point val="50,16.8475"/>
             </dia:attribute>
             <dia:attribute name="color">
               <dia:color val="#000000ff"/>
@@ -620,7 +621,7 @@ kernel#</dia:string>
         <dia:point val="39,9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.5787,7.42625;41.4213,10.5738"/>
+        <dia:rectangle val="36.6975,7.32969;41.3244,10.6703"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -628,7 +629,7 @@ kernel#</dia:string>
             <dia:string>#TF-A
 Secure Monitor
 
-BL32#</dia:string>
+BL31#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
@@ -637,7 +638,7 @@ BL32#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="39,8.02125"/>
+            <dia:point val="39,8.03656"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -659,7 +660,7 @@ BL32#</dia:string>
         <dia:point val="31.5,11.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.1588,11.2;32.8413,12.7475"/>
+        <dia:rectangle val="30.2563,11.2;32.7437,12.875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -674,7 +675,7 @@ to RAM#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="31.5,11.795"/>
+            <dia:point val="31.5,11.885"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -693,7 +694,7 @@ to RAM#</dia:string>
         <dia:point val="21.55,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.1438,6;22.9563,8.3475"/>
+        <dia:rectangle val="20.2112,6;22.8887,8.475"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -709,7 +710,7 @@ and runs#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="21.55,6.595"/>
+            <dia:point val="21.55,6.685"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -756,7 +757,7 @@ and runs#</dia:string>
         <dia:point val="32.2,7.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.015,7.45;33.385,8.1975"/>
+        <dia:rectangle val="31.1,7.45;33.3,8.325"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -770,7 +771,7 @@ and runs#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="32.2,8.045"/>
+            <dia:point val="32.2,8.135"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -789,7 +790,7 @@ and runs#</dia:string>
         <dia:point val="40.25,12.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.4712,12.3;41.0287,13.0475"/>
+        <dia:rectangle val="39.5025,12.3;40.9975,13.175"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -803,7 +804,7 @@ and runs#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="40.25,12.895"/>
+            <dia:point val="40.25,12.985"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -850,7 +851,7 @@ and runs#</dia:string>
         <dia:point val="44.75,13.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="43.3412,13.85;46.1587,16.1975"/>
+        <dia:rectangle val="43.3987,13.85;46.1013,16.325"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -866,7 +867,7 @@ runs#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="44.75,14.445"/>
+            <dia:point val="44.75,14.535"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -903,7 +904,7 @@ runs#</dia:string>
         <dia:point val="9,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.915,11;11.085,11.7475"/>
+        <dia:rectangle val="7.04625,11;10.9537,11.875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -917,7 +918,7 @@ runs#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="9,11.595"/>
+            <dia:point val="9,11.685"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -936,7 +937,7 @@ runs#</dia:string>
         <dia:point val="9.75,14.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.94875,14.25;12.5512,14.9975"/>
+        <dia:rectangle val="7.08125,14.25;12.4187,15.125"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -950,7 +951,7 @@ runs#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="9.75,14.845"/>
+            <dia:point val="9.75,14.935"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
diff --git a/slides/sysdev-bootloaders-tf-a/stm32mp1-tfa.dia b/slides/sysdev-bootloaders-tf-a/stm32mp1-tfa.dia
index 35599db8..fde7cdd2 100644
--- a/slides/sysdev-bootloaders-tf-a/stm32mp1-tfa.dia
+++ b/slides/sysdev-bootloaders-tf-a/stm32mp1-tfa.dia
@@ -99,6 +99,7 @@
   </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="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">
@@ -871,13 +872,13 @@ TF-A itself#</dia:string>
         <dia:point val="41.5,11.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="40.0412,10.2625;42.9587,11.9375"/>
+        <dia:rectangle val="39.2687,10.2297;43.7531,11.9703"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
             <dia:string>#TF-A code
-(BL2)#</dia:string>
+(BL2 and BL31)#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
@@ -886,7 +887,7 @@ TF-A itself#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="41.5,10.9475"/>
+            <dia:point val="41.5,10.9366"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>




More information about the training-materials-updates mailing list