[FE training-materials-updates] Reduce the coverage of uImage

[Michael Opdenacker]

Repository : git://git.free-electrons.com/training-materials.git
On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=df824c77c5966ca0816851269d1dcfc13f277127

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

commit df824c77c5966ca0816851269d1dcfc13f277127
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Mon Nov 2 18:31:45 2015 +0100

    Reduce the coverage of uImage
    
    - This simplifies the explanations, especially the U-Boot ones
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>


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

df824c77c5966ca0816851269d1dcfc13f277127
 slides/initramfs/initramfs.dia                     |  8 +++----
 .../sysdev-bootloaders-u-boot.tex                  | 25 +++-------------------
 .../sysdev-linux-intro-cross-compilation.tex       |  6 +++---
 3 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/slides/initramfs/initramfs.dia b/slides/initramfs/initramfs.dia
index 702a2cb..59fb580 100644
--- a/slides/initramfs/initramfs.dia
+++ b/slides/initramfs/initramfs.dia
@@ -164,7 +164,7 @@
         <dia:point val="21.35,9.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.35,8.565;29.7525,9.4875"/>
+        <dia:rectangle val="21.35,8.3875;28.425,9.545"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -197,7 +197,7 @@
         <dia:point val="37.65,8.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.225,7.615;42.075,10.5131"/>
+        <dia:rectangle val="33.9925,7.4375;41.3075,10.5706"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -232,12 +232,12 @@ archive#</dia:string>
         <dia:point val="25.355,13.375"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.355,12.64;40.2575,13.5625"/>
+        <dia:rectangle val="25.355,12.4336;37.7939,13.6779"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#Kernel image (uImage, bzImage, etc.)#</dia:string>
+            <dia:string>#Kernel image (zImage, bzImage, etc.)#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="Latin Modern Sans" style="0" name="Courier"/>
diff --git a/slides/sysdev-bootloaders-u-boot/sysdev-bootloaders-u-boot.tex b/slides/sysdev-bootloaders-u-boot/sysdev-bootloaders-u-boot.tex
index a9309e9..e7f5a8a 100644
--- a/slides/sysdev-bootloaders-u-boot/sysdev-bootloaders-u-boot.tex
+++ b/slides/sysdev-bootloaders-u-boot/sysdev-bootloaders-u-boot.tex
@@ -199,7 +199,7 @@ U-Boot 2013.04 (May 29 2013 - 10:30:21)
   \item \code{help} and \code{help command}
   \item \code{boot}, runs the default boot command, stored in
     \code{bootcmd}
-  \item \code{bootm <address>}, starts a kernel image loaded at the
+  \item \code{bootz <address>}, starts a kernel image loaded at the
     given address in RAM
   \item \code{ext2load}, loads a file from an ext2 filesystem to RAM
     \begin{itemize}
@@ -319,8 +319,8 @@ u-boot # saveenv
   \item Example
     \begin{itemize}
     \item \code{setenv mmc-boot 'if fatload mmc 0 80000000
-      boot.ini; then source; else if fatload mmc 0 80000000 uImage;
-      then run mmc-bootargs; bootm; fi; fi'}
+      boot.ini; then source; else if fatload mmc 0 80000000 zImage;
+      then run mmc-boot; fi; fi'}
   \end{itemize}
 \end{itemize}
 \end{frame}
@@ -372,22 +372,3 @@ u-boot # saveenv
     \end{itemize}
   \end{itemize}
 \end{frame}
-
-\begin{frame}
-  \frametitle{U-boot mkimage}
-  \begin{itemize}
-  \item The kernel image that U-Boot loads and boots must be prepared,
-    so that a U-Boot specific header is added in front of the image
-    \begin{itemize}
-    \item This header gives details such as the image size, the
-      expected load address, the compression type, etc.
-    \end{itemize}
-  \item This is done with a tool that comes in U-Boot, \code{mkimage}
-  \item Debian / Ubuntu: just install the \code{u-boot-tools} package.
-  \item Or, compile it by yourself: simply configure U-Boot for any
-    board of any architecture and compile it. Then install \code{mkimage}:\\
-    \code{cp tools/mkimage /usr/local/bin/}
-  \item The special target \code{uImage} of the kernel Makefile can
-    then be used to generate a kernel image suitable for U-Boot.
-\end{itemize}
-\end{frame}
diff --git a/slides/sysdev-linux-intro-cross-compilation/sysdev-linux-intro-cross-compilation.tex b/slides/sysdev-linux-intro-cross-compilation/sysdev-linux-intro-cross-compilation.tex
index d8ee939..d702b93 100644
--- a/slides/sysdev-linux-intro-cross-compilation/sysdev-linux-intro-cross-compilation.tex
+++ b/slides/sysdev-linux-intro-cross-compilation/sysdev-linux-intro-cross-compilation.tex
@@ -139,7 +139,7 @@
   \item Run \code{make}
   \item Copy the final kernel image to the target storage
     \begin{itemize}
-    \item can be \code{uImage}, \code{zImage}, \code{vmlinux},
+    \item can be \code{zImage}, \code{vmlinux},
       \code{bzImage} in \code{arch/<arch>/boot}
     \item copying the Device Tree Blob might be necessary as well,
       they are available in \code{arch/<arch>/boot/dts}
@@ -181,8 +181,8 @@
     \begin{enumerate}
     \item Load \code{zImage} or \code{uImage} at address X in memory
     \item Load \code{<board>.dtb} at address Y in memory
-    \item Start the kernel with \code{bootz X - Y} or
-      \code{bootm X - Y}\\
+    \item Start the kernel with \code{bootz X - Y} (\code{zImage} case),
+      or \code{bootm X - Y} (\code{uImage} case)\\
       The \code{-} in the middle indicates no {\em initramfs}
     \end{enumerate}
   \end{itemize}