[FE training-materials-updates] Merge branch 'master' into marvell-armada

[Michael Opdenacker]

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

On branch  : marvell-armada
Link       : http://git.free-electrons.com/training-materials/commit/?id=7ced1ac3b5e24f1f88e43412ab3e0fcd9a2baa48

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

commit 7ced1ac3b5e24f1f88e43412ab3e0fcd9a2baa48
Merge: 4ffe182 dc00f48
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Wed Jul 23 13:34:25 2014 +0200

    Merge branch 'master' into marvell-armada
    
    - Needed to get the lab archive file name changes



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

7ced1ac3b5e24f1f88e43412ab3e0fcd9a2baa48
 .gitignore                                         |    2 +-
 Makefile                                           |   29 ++--
 gen-lab-archive                                    |   22 ++-
 .../bootloader/beaglebone-black/MBR                |  Bin 512 -> 512 bytes
 .../bootloader/beaglebone-black/MLO                |  Bin 76908 -> 76908 bytes
 .../bootloader/beaglebone-black/MLO.final          |  Bin 98240 -> 98240 bytes
 .../bootloader/beaglebone-black/README.txt         |    0
 .../beaglebone-black/am335x-boneblack.dtb          |  Bin 26024 -> 26024 bytes
 .../src/0001-BBB-configuration-ignoring-eMMC.patch |    0
 .../beaglebone-black/src/busybox-1.21.x.config     |    0
 .../src/linux-3.12-bone-black.config               |    0
 .../bootloader/beaglebone-black/src/rootfs.tar.xz  |  Bin 565068 -> 565068 bytes
 .../bootloader/beaglebone-black/u-boot.img         |  Bin 328920 -> 328920 bytes
 .../bootloader/beaglebone-black/u-boot.img.final   |  Bin 304776 -> 304776 bytes
 .../bootloader/beaglebone-black/uEnv.txt           |    0
 .../bootloader/beaglebone-black/uImage             |  Bin 5827416 -> 5827416 bytes
 lab-data/{linux => kernel}/git.tar.xz              |  Bin 164 -> 164 bytes
 .../modules/data/buildroot-2013.11.config          |    0
 .../modules/data/busybox-1.21.x.config             |    0
 lab-data/{linux => kernel}/modules/nfsroot.tar.xz  |  Bin 2575440 -> 2575440 bytes
 .../modules/nfsroot/root/debugging/Makefile        |    0
 .../modules/nfsroot/root/debugging/drvbroken.c     |    0
 .../modules/nfsroot/root/hello/Makefile            |    0
 .../modules/nfsroot/root/hello/hello_version.c     |    0
 .../modules/nfsroot/root/nunchuk/Makefile          |    0
 .../modules/nfsroot/root/nunchuk/nunchuk.c         |    0
 .../modules/nfsroot/root/serial/Makefile           |    0
 .../modules/nfsroot/root/serial/feserial.c         |    0
 .../nfsroot/root/serial/serial-get-counter.c       |    0
 .../nfsroot/root/serial/serial-reset-counter.c     |    0
 ...isc-assign-file-private_data-in-all-cases.patch |    0
 ...buildroot-2013.02-bump-xenomai-to-2.6.2.1.patch |    0
 ...in-wrapper-fix-paths-if-executable-was-re.patch |    0
 lab-data/{ => sysdev}/realtime/rttest/data/doload  |    0
 .../data/linux-3.5.7-igepv2-fix-pinmux.patch       |    0
 .../{ => sysdev}/realtime/rttest/data/netcat.data  |    0
 .../{ => sysdev}/realtime/rttest/data/rttest.c     |    0
 labs/android-adb/android-adb.tex                   |    2 +-
 labs/android-application/android-application.tex   |    2 +-
 labs/android-boot/android-boot.tex                 |   34 ++---
 .../android-first-compilation.tex                  |    4 +-
 labs/android-jni-library/android-jni-library.tex   |   32 +++--
 labs/android-native-app/android-native-app.tex     |   27 +---
 labs/android-new-board/android-new-board.tex       |    9 +-
 labs/android-source-code/android-source-code.tex   |    4 +-
 .../android-system-customization.tex               |   14 +-
 labs/kernel-board-setup/kernel-board-setup.tex     |    2 +-
 .../kernel-compiling-and-nfs-booting.tex           |    6 +-
 labs/kernel-debugging/kernel-debugging.tex         |    4 +-
 labs/kernel-git/kernel-git.tex                     |    2 +-
 .../kernel-i2c-communication.tex                   |    4 +-
 .../kernel-i2c-device-model.tex                    |    4 +-
 labs/kernel-module-simple/kernel-module-simple.tex |    6 +-
 labs/kernel-serial-iomem/kernel-serial-iomem.tex   |    2 +-
 labs/kernel-serial-output/kernel-serial-output.tex |    2 +-
 .../kernel-sources-download.tex                    |    4 +-
 .../kernel-sources-exploring.tex                   |    2 +-
 labs/setup/setup.tex                               |   15 +-
 .../sysdev-application-debugging.tex               |    2 +-
 .../sysdev-application-development.tex             |    4 +-
 .../sysdev-block-filesystems.tex                   |    2 +-
 labs/sysdev-buildroot/sysdev-buildroot.tex         |    2 +-
 .../sysdev-flash-filesystems.tex                   |    4 +-
 .../sysdev-kernel-cross-compiling.tex              |    2 +-
 .../sysdev-kernel-fetch-and-patch.tex              |    2 +-
 labs/sysdev-real-time/sysdev-real-time.tex         |   12 +-
 labs/sysdev-thirdparty/sysdev-thirdparty.tex       |   58 ++++----
 labs/sysdev-tinysystem/sysdev-tinysystem.tex       |    8 +-
 labs/sysdev-toolchain/sysdev-toolchain.tex         |    2 +-
 labs/sysdev-u-boot/sysdev-u-boot.tex               |    2 +-
 .../android-framework-ipc.tex                      |   23 ---
 .../android-introduction-architecture.tex          |    2 +-
 .../android-introduction-features.tex              |    4 +-
 .../android-introduction-hardware.tex              |  146 ++++++++++++++++++++
 slides/android-introduction-hardware/maid-oven.jpg |  Bin 0 -> 266079 bytes
 slides/android-introduction-hardware/nook.jpg      |  Bin 0 -> 111359 bytes
 .../nordicktrack-treadmill.jpg                     |  Bin 0 -> 74072 bytes
 slides/android-introduction-hardware/odroid.jpg    |  Bin 0 -> 32477 bytes
 .../android-introduction-history.tex               |    6 +
 slides/android-introduction-history/sidekick.jpg   |  Bin 0 -> 60007 bytes
 .../kernel-source-code-drivers.tex                 |    6 +-
 81 files changed, 320 insertions(+), 201 deletions(-)