Merge branch 'jan'

Conflicts:
	application-devel/embedded-devel/pres_embedded-devel_de.tex
	flash-memory/flash-filesystems/pres_flashfilesystems_en.tex
	linux-basics/linux-processes/pres_linux-processes_en.tex

Signed-off-by: Manuel Traut <manut@linutronix.de>

1 files changed, 37 insertions, 0 deletions

diff --git a/flash-memory/flash-filesystems/pres_flashfilesystems_en.tex b/flash-memory/flash-filesystems/pres_flashfilesystems_en.tex
index a9164fd..5de794f 100644
--- a/flash-memory/flash-filesystems/pres_flashfilesystems_en.tex
+++ b/flash-memory/flash-filesystems/pres_flashfilesystems_en.tex
@@ -34,6 +34,27 @@ $ dmesg
 
 \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}
+
+\begin{frame}
+\frametitle{JFFS2}
+\begin{figure}[h]
+\centering
+\includegraphics[width=8cm]{images/jffs2.png}
+\end{figure}
+\end{frame}
+
+\begin{frame}[fragile]
 \frametitle{Using JFFS2}
 \begin{lstlisting}
 # Create JFFS2 image
@@ -57,6 +78,22 @@ root=/dev/mtdblock0 rootfstype=jffs2
 \end{frame}
 
 \subsubsection{UBI and UBIFS}
+\begin{frame}
+\frametitle{UBI: Unsorted Block Images}
+\begin{figure}[h]
+\centering
+\includegraphics[width=8cm]{images/ubi.png}
+\end{figure}
+\end{frame}
+
+\begin{frame}
+\frametitle{UBIFS}
+\begin{figure}[h]
+\centering
+\includegraphics[width=8cm]{images/ubifs.png}
+\end{figure}
+\end{frame}
+
 \begin{frame}[fragile]
 \frametitle{Using UBIFS}
 \begin{lstlisting}