[FE training-materials-updates] Revert "Warn about the tftp issue in 12.04 and beyond"

[Michael Opdenacker]

Repository : git://git.free-electrons.com/training-materials.git

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

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

commit 0a1ef2cf105aa40589e4c3486a6efa86e3c94211
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Wed Jan 23 15:44:14 2013 +0100

    Revert "Warn about the tftp issue in 12.04 and beyond"
    
    Put the warning in labs instead
    (good recommendation from Thomas)
    
    This reverts commit 19b82e4ebb4884d0d1c436a3e437c8f6b415f39f.
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>


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

0a1ef2cf105aa40589e4c3486a6efa86e3c94211
 .../kernel-module-environment.tex                  |   11 ++++++++++-
 labs/sysdev-u-boot/sysdev-u-boot.tex               |   11 ++++++++++-
 .../sysdev-bootloaders-u-boot.tex                  |   14 +++-----------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/labs/kernel-module-environment/kernel-module-environment.tex b/labs/kernel-module-environment/kernel-module-environment.tex
index ec68ef3..3ea40f0 100644
--- a/labs/kernel-module-environment/kernel-module-environment.tex
+++ b/labs/kernel-module-environment/kernel-module-environment.tex
@@ -247,7 +247,16 @@ workstation. Then, from U-Boot, do:
 tftp 0x21000000 textfile.txt
 \end{verbatim}
 
-This should download the file \code{textfile.txt} from your development
+{\bf Caution: known issue in Ubuntu 12.04 and later}:
+if this command doesn't work, you may have you have to stop the server
+and start it again every time you boot your workstation:  
+
+\begin{verbatim}
+/etc/init.d/tftpd-hpa restart
+\end{verbatim}
+
+The \code{tftp} command should command should have downloaded
+the \code{textfile.txt} file from your development
 workstation into the board's memory at location \code{0x21000000} (this
 location is part of the board DRAM). You can verify that the download
 was successful by dumping the contents of the memory:
diff --git a/labs/sysdev-u-boot/sysdev-u-boot.tex b/labs/sysdev-u-boot/sysdev-u-boot.tex
index 98ecf98..af91b81 100644
--- a/labs/sysdev-u-boot/sysdev-u-boot.tex
+++ b/labs/sysdev-u-boot/sysdev-u-boot.tex
@@ -439,7 +439,16 @@ workstation. Then, from U-Boot, do:
 tftp 0x80000000 textfile.txt
 \end{verbatim}
 
-This should download the file \code{textfile.txt} from your development
+{\bf Caution: known issue in Ubuntu 12.04 and later}:
+if this command doesn't work, you may have you have to stop the server
+and start it again every time you boot your workstation:
+
+\begin{verbatim}
+/etc/init.d/tftpd-hpa restart
+\end{verbatim}
+
+The \code{tftp} command should command should have downloaded
+the \code{textfile.txt} file from your development
 workstation into the board's memory at location 0x80000000 (this
 location is part of the board DRAM). You can verify that the download
 was successful by dumping the contents of the memory:
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 325a5ca..605c350 100644
--- a/slides/sysdev-bootloaders-u-boot/sysdev-bootloaders-u-boot.tex
+++ b/slides/sysdev-bootloaders-u-boot/sysdev-bootloaders-u-boot.tex
@@ -333,7 +333,7 @@ u-boot # saveenv
 \end{frame}
 
 \begin{frame}
-  \frametitle{TFTP (1)}
+  \frametitle{TFTP}
   \begin{itemize}
   \item Network transfer from the development workstation and U-Boot
     on the target takes place through TFTP
@@ -347,17 +347,9 @@ u-boot # saveenv
     \item \code{sudo apt-get install tftpd-hpa}
     \item All files in \code{/var/lib/tftpboot} are then visible
       through TFTP
-    \item {\bf Caution: known issue in Ubuntu 12.04 and later}\\
-	At every boot, you have to stop the server and start it again.
-	Otherwise, the server won't answer requests:\\
-	\code{/etc/init.d/tftpd-hpa restart} 
+    \item A TFTP client is available in the \code{tftp-hpa} package,
+      for testing
     \end{itemize}
-  \end{itemize}
-\end{frame}
-
-\begin{frame}
-  \frametitle{TFTP (2)}
-  \begin{itemize}
   \item A TFTP client is integrated into U-Boot
     \begin{itemize}
     \item Configure the \code{ipaddr} and \code{serverip} environment