[FE training-materials-updates] Merge branch 'master' of git.free-electrons.com:training-materials

[michael.opdenacker at free-electrons.com]

- Log -----------------------------------------------------------------
http://git.free-electrons.com/training-materials/commit/?id=83eba92d6d28204e934650fcd499512a816019f7

commit 83eba92d6d28204e934650fcd499512a816019f7
Merge: 2b31433 13ee7a8
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Tue Jun 26 15:39:37 2012 +0200

    Merge branch 'master' of git.free-electrons.com:training-materials


http://git.free-electrons.com/training-materials/commit/?id=2b3143328f1b6c3eceaf6c0aace19a28be5e17b9

commit 2b3143328f1b6c3eceaf6c0aace19a28be5e17b9
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Tue Jun 26 15:38:03 2012 +0200

    u-boot.bin flashing instructions more error-proof

diff --git a/labs/sysdev-flash-filesystems/sysdev-flash-filesystems.tex b/labs/sysdev-flash-filesystems/sysdev-flash-filesystems.tex
index 8a66ba4..c6ecac4 100644
--- a/labs/sysdev-flash-filesystems/sysdev-flash-filesystems.tex
+++ b/labs/sysdev-flash-filesystems/sysdev-flash-filesystems.tex
@@ -63,8 +63,8 @@ naturally in the \code{arch/<arch>/<march>/<board>.c} since it is
 board dependent. Nevertheless, during device development, it can be
 useful to define partitions at boot time, on the kernel command line.
 
-Enter the U-Boot shell and erase the NAND flash, from offset
-0x00280000, up to the end of the NAND flash (tip: if you don't
+Enter the U-Boot shell and erase NAND flash, from offset
+0x00280000, up to the end of the NAND flash storage (tip: if you don't
 specify the number of bytes to erase, \code{onenand erase} will
 continue until it reaches the end).
 
diff --git a/labs/sysdev-u-boot/sysdev-u-boot.tex b/labs/sysdev-u-boot/sysdev-u-boot.tex
index 1886869..1396b4f 100644
--- a/labs/sysdev-u-boot/sysdev-u-boot.tex
+++ b/labs/sysdev-u-boot/sysdev-u-boot.tex
@@ -289,32 +289,39 @@ This loads the file from MMC 0 partition 0 to memory at address 0x80000000
 nandecc hw
 \end{verbatim}
 
-This tells U-Boot to write data to the NAND using the hardware ECC
+This tells U-Boot to write data to NAND using the hardware ECC
 algorithm, which the ROM code of the OMAP uses to load X-Loader.
 
 \begin{verbatim}
 nand erase 0 80000
 \end{verbatim}
 
-This command erases a 0x80000 byte long space of the NAND flash from offset 0
+This command erases a 0x80000 byte long space of NAND flash from offset 0
 
 \begin{verbatim}
 nand write 80000000 0 80000
 \end{verbatim}
 
-This command writes data to the NAND flash. The source is 0x80000000
+This command writes data to NAND flash. The source is 0x80000000
 (where we've loaded the file to store in the flash) and the
-destination is offset 0 of the NAND flash. The length of the copy is
+destination is offset 0 of NAND flash. The length of the copy is
 0x80000 bytes, which corresponds to the space we've just erased
 before. It is important to erase the flash space before trying to
 write on it.
 
-X-Loader has been transfered to NAND flash. You can now do the same
-with U-Boot.  The storage offset in the NAND is 0x80000 (just after
-the space reserved for X-Loader) and the length is 0x180000. You will
-have to flash U-Boot to NAND with the software ECC algorithm, which
+Now that X-Loader has been transfered to NAND flash, you can now do the same
+with U-Boot. 
+
+You will have to flash U-Boot to NAND with the software ECC algorithm, which
 X-Loader uses to load U-Boot from NAND. This can be achieved by
-running the \code{nandecc sw} command.
+running the below command:
+
+\begin{verbatim}
+nandecc sw
+\end{verbatim}
+
+The storage offset in NAND is 0x80000 (just after
+the space reserved for X-Loader) and the length is 0x180000.
 
 After flashing the U-Boot image, also erase the U-boot environment
 variables defined by the manufacturer or by previous users of your

-----------------------------------------------------------------------

Summary of changes:
 .../sysdev-flash-filesystems.tex                   |    4 ++--
 labs/sysdev-u-boot/sysdev-u-boot.tex               |   25 +++++++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)