[bootlin/training-materials updates] master: Embedded Linux labs: proper fix for compiling TF-A (e96c20ed)

[Michael Opdenacker]

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

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

commit e96c20ed7528fca8aeff0a571153c253575e8de6
Author: Michael Opdenacker <michael.opdenacker at bootlin.com>
Date:   Fri Nov 25 15:13:56 2022 +0100

    Embedded Linux labs: proper fix for compiling TF-A
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at bootlin.com>


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

e96c20ed7528fca8aeff0a571153c253575e8de6
 labs/sysdev-toolchain/sysdev-toolchain.tex       |  9 +++++++++
 labs/sysdev-u-boot-stm32/sysdev-u-boot-stm32.tex | 21 ---------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/labs/sysdev-toolchain/sysdev-toolchain.tex b/labs/sysdev-toolchain/sysdev-toolchain.tex
index 0171ed92..674310e7 100644
--- a/labs/sysdev-toolchain/sysdev-toolchain.tex
+++ b/labs/sysdev-toolchain/sysdev-toolchain.tex
@@ -117,6 +117,15 @@ In \code{Toolchain options}:
       much longer to type.
 \end{itemize}
 
+\ifdefstring{\labboard}{stm32mp1}{
+In \code{Binary utilities}
+\begin{itemize}
+\item Set \code{Version of binutils}, choose \code{2.38}.
+      We currently need to stick to to this version to compile TF-A
+      in the next lab.
+\end{itemize}
+}{}
+
 In \code{C-library}:
 \begin{itemize}
   \item If not set yet, set \code{C library} to \code{uClibc-ng}
diff --git a/labs/sysdev-u-boot-stm32/sysdev-u-boot-stm32.tex b/labs/sysdev-u-boot-stm32/sysdev-u-boot-stm32.tex
index a54b456c..78be7134 100644
--- a/labs/sysdev-u-boot-stm32/sysdev-u-boot-stm32.tex
+++ b/labs/sysdev-u-boot-stm32/sysdev-u-boot-stm32.tex
@@ -200,27 +200,6 @@ Several configuration parameters have to be passed to the Makefile:
       \code{BL33=../u-boot/u-boot-nodtb.bin}
 \end{itemize}
 
-{\bf Important note}: the version of TF-A that we currently use
-fails to build with gcc versions greater than 11.2, and our toolchain
-is based on gcc 11.3. To compile TF-A binaries, we will need to use
-a different toolchain, until this issue is fixed in upstream TF-A.
-
-So, let's use a ready-made Bootlin toolchain with gcc 10.3, but just
-for building TF-A:
-
-\begin{bashinput}
-$ cd $HOME/x-tools
-$ wget https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--stable-2021.11-1.tar.bz2
-$ tar xf armv7-eabihf--uclibc--stable-2021.11-1.tar.bz2
-$ cd armv7-eabihf--uclibc--stable-2021.11-1
-$ ./relocate-sdk.sh
-$ export PATH=$HOME/x-tools/armv7-eabihf--uclibc--stable-2021.11-1/bin:$PATH
-\end{bashinput}
-
-Then get back to the
-\code{$HOME/__SESSION_NAME__-labs/bootloader/trusted-firmware-a/}
-directory.
-
 We can now generate the \code{bl32}, \code{dtb}, and \code{fip} targets
 with a single command line:
 \begin{bashinput}