flash-memory: Fix buildproblems and frame ordering

Signed-off-by: Holger Dengler <dengler@linutronix.de>

4 files changed, 34 insertions, 39 deletions

diff --git a/flash-memory/flash-filesystems/pres_flashfilesystems_en.tex b/flash-memory/flash-filesystems/pres_flashfilesystems_en.tex
index 1f027ef..5edcf91 100644
--- a/flash-memory/flash-filesystems/pres_flashfilesystems_en.tex
+++ b/flash-memory/flash-filesystems/pres_flashfilesystems_en.tex
@@ -1,5 +1,3 @@
-\def\lximg{/usr/share/lx/icons/fueller.png}
-
 \input{configpres}
 
 \subsection{Creating Flashfilesystems}
@@ -7,18 +5,30 @@
 \title{Creating Flashfilesystems}
 \maketitle
 
-\def\lximg{none}
-
 \begin{frame}
 \frametitle{Contents}
 \tableofcontents
 \end{frame}
 
+\subsubsection{MTD}
+\begin{frame}[fragile]
+\frametitle{MTD Flash partitioning}
+\begin{itemize}
+\item Redboot partition parsing
+\item Boardsupport
+\item Kernelparameters:
+\begin{verbatim}
+mtdparts=edb7312-nor:256k(ARMboot)ro,
+-(root);edb7312-nand:-(home)
+\end{verbatim}
+\end{itemize}
+\end{frame}
+
 \subsubsection{Emulation}
 \begin{frame}[fragile]
 \frametitle{Emulating flash devices}
 Exercise:
-\begin{lstlisting}
+\begin{verbatim}
 $ sudo modprobe nandsim
 $ cat /proc/mtd 
 dev:    size   erasesize  name
@@ -30,23 +40,10 @@ $ dmesg
 [  128.718425] OOB area size: 16 bytes
 [  128.718426] sector size: 16 KiB
 [...]
-\end{lstlisting}
-\end{frame}
-
-\subsubsection{JFFS2}
-\begin{frame}[fragile]
-\frametitle{MTD Flash partitioning}
-\begin{itemize}
-\item Redboot partition parsing
-\item Boardsupport
-\item Kernelparameters:
-\begin{verbatim}
-mtdparts=edb7312-nor:256k(ARMboot)ro,
--(root);edb7312-nand:-(home)
 \end{verbatim}
-\end{itemize}
 \end{frame}
 
+\subsubsection{JFFS2}
 \begin{frame}
 \frametitle{JFFS2}
 \begin{figure}[h]
@@ -58,7 +55,7 @@ mtdparts=edb7312-nor:256k(ARMboot)ro,
 \begin{frame}[fragile]
 \frametitle{Using JFFS2}
 Exercise:
-\begin{lstlisting}
+\begin{verbatim}
 # Create JFFS2 image
 $ /usr/sbin/mkfs.jffs2 -e 131072 \
              -d source_directory \
@@ -71,13 +68,13 @@ $ sudo nandwrite -p /dev/mtd0 jffs2.img
 $ sudo modprobe mtdblock
 # Mounting the image
 $ sudo mount -t jffs2 /dev/mtdblock0 /mnt
-\end{lstlisting}
+\end{verbatim}
 Clean-up:
-\begin{lstlisting}
+\begin{verbatim}
 # Unmount the image and erase flash partition
 $ sudo umount /mnt
 $ sudo flash_erase -j /dev/mtd0 0 0
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 \begin{frame}[fragile]
@@ -138,7 +135,7 @@ root=/dev/mtdblock0 rootfstype=jffs2
 \begin{frame}[fragile]
 \frametitle{Using UBIFS}
 Exercise:
-\begin{lstlisting}
+\begin{verbatim}
 # 1) Loading module and attach UBI to MTD device
 $ sudo modprobe ubi
 $ sudo ubiattach ubiattach -m 0
@@ -157,27 +154,27 @@ UBI: data offset:                512
 # 3) Creating an UBIFS image
 $ /usr/sbin/mkfs.ubifs -r test -m 512 -e 15872 \
               -c 8450 -o ubifs.img
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 \begin{frame}[fragile]
 \frametitle{Using UBIFS}
 Exercise (cont.):
-\begin{lstlisting}
+\begin{verbatim}
 # 4) Creating a volume
 $ sudo ubimkvol /dev/ubi0 -N myvolume -s 64MiB
 # 5) Writing the image
 $ sudo ubiupdatevol /dev/ubi0_0 ubifs.img
 # 6) Mounting UBIFS
 $ sudo mount -t ubifs ubi0:myvolume /mnt/
-\end{lstlisting}
+\end{verbatim}
 Clean-up:
-\begin{lstlisting}
+\begin{verbatim}
 # Unmounting image, detach UBI from MTD device, and erase flash partition
 $ sudo umount /mnt
 $ sudo ubidetach -m 0
 $ sudo flash_erase -j /dev/mtd0 0 0
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 \begin{frame}[fragile]
@@ -198,7 +195,7 @@ vol_flags=autoresize
 \begin{frame}[fragile]
 \frametitle{UBI: Create flash images}
 Exercise:
-\begin{lstlisting}
+\begin{verbatim}
 # 1) Create the ubi image
 $ /usr/sbin/ubinize -o ubi.img -m 512 -s 256 -p 16384 ubinize.cfg
 # 2) Write the image
@@ -207,14 +204,14 @@ $ sudo nandwrite /dev/mtd0 ubi.img
 $ sudo ubiattach -m 0
 # 4) Mount UBIFS
 $ sudo mount -t ubifs ubi0:myvolume /mnt/
-\end{lstlisting}
+\end{verbatim}
 Clean-up:
-\begin{lstlisting}
+\begin{verbatim}
 # Unmounting image, detach UBI from MTD device, and erase flash partition
 $ sudo umount /mnt
 $ sudo ubidetach -m 0
 $ sudo flash_erase -j /dev/mtd0 0 0
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 \begin{frame}[fragile]
diff --git a/flash-memory/mtd/pres_mtd_en.tex b/flash-memory/mtd/pres_mtd_en.tex
index 9cf294b..3ece36e 100644
--- a/flash-memory/mtd/pres_mtd_en.tex
+++ b/flash-memory/mtd/pres_mtd_en.tex
@@ -6,7 +6,7 @@
 \maketitle
 
 \begin{frame}
-	\tableofcontents
+\tableofcontents
 \end{frame}
 
 \subsubsection{Overview}
diff --git a/flash-memory/technology/pres_technology_en.tex b/flash-memory/technology/pres_technology_en.tex
index 546a1be..508051e 100644
--- a/flash-memory/technology/pres_technology_en.tex
+++ b/flash-memory/technology/pres_technology_en.tex
@@ -1,5 +1,3 @@
-\def\lximg{/usr/share/lx/icons/fueller.png}
-
 \input{configpres}
 
 \subsection{Technology}
@@ -7,8 +5,6 @@
 \title{Flash-Memory Technology}
 \maketitle
 
-\def\lximg{none}
-
 \begin{frame}
 \frametitle{Contents}
 \tableofcontents
diff --git a/flash-memory/ubi/pres_ubi_en.tex b/flash-memory/ubi/pres_ubi_en.tex
index 32a5cb9..badaefc 100644
--- a/flash-memory/ubi/pres_ubi_en.tex
+++ b/flash-memory/ubi/pres_ubi_en.tex
@@ -1,9 +1,11 @@
 \input{configpres}
 
 \subsection{UBI - Unsorted Block Images}
+\title{\lq UBI - Unsorted Block Images\rq}
+\maketitle
 
 \begin{frame}
-	\tableofcontents
+\tableofcontents
 \end{frame}
 
 \subsubsection{Concepts}