[FE training-materials-updates] Merge branch 'master' into kernel-ng

Michael Opdenacker michael.opdenacker at free-electrons.com
Wed Sep 18 21:51:12 CEST 2013


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

On branch  : kernel-ng
Link       : http://git.free-electrons.com/training-materials/commit/?id=afa9da323f9889505628c5d4b97636276aa8feef

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

commit afa9da323f9889505628c5d4b97636276aa8feef
Merge: 0917a62 d4fbdcb
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Wed Sep 18 21:48:46 2013 +0200

    Merge branch 'master' into kernel-ng
    
    Needed to get the Makefile cleanups (in particular) into the kernel-ng branch



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

afa9da323f9889505628c5d4b97636276aa8feef
 Makefile                                           |    7 +-
 common/android-title.tex                           |    2 +-
 common/labs.sty                                    |    4 +-
 .../java/com/fe/android/backend/DummyBackend.java  |    3 +
 lab-data/android/{aosp => source}/.empty           |    0
 lab-data/boottime/application/strace-summary.log   |   56 +
 lab-data/boottime/application/strace.log           | 3482 ++++++++++++++++++++
 ...h => sama5d3xek-barebox-fast-boot-config.patch} |   57 +-
 lab-data/boottime/buildroot/data/1frame.avi        |  Bin 0 -> 7872 bytes
 .../boottime/buildroot/solutions/post-build1.sh    |   30 +
 lab-data/boottime/kernel/env.sh                    |    3 +
 lab-data/boottime/results/init-scripts/bootlog.png |  Bin 0 -> 42470 bytes
 lab-data/boottime/results/init-scripts/bootlog.tgz |  Bin 0 -> 6760 bytes
 lab-data/boottime/results/kernel/boot.png          |  Bin 0 -> 48648 bytes
 lab-data/boottime/results/kernel/boot.svg          |  108 +
 .../results/kernel/config-3.6.9-at91-with-modules} | 1947 ++++++-----
 .../boottime/results/kernel/initcall_debug.log     |  905 +++++
 lab-data/boottime/results/kernel/rcS               |   39 +
 .../results/measuring/boot-instrumented1.log       |  302 ++
 .../boottime/results/measuring/boot-noudev.log     |  295 ++
 .../results/measuring/boot-postpone-services.log   |  296 ++
 .../results/measuring/boot-simplify-launcher.log   |  294 ++
 lab-data/boottime/setup/install-packages           |    4 +
 labs/android-adb/android-adb.tex                   |    2 +-
 labs/android-application/android-application.tex   |    3 +
 labs/android-boot/android-boot.tex                 |   10 +-
 .../android-first-compilation.tex                  |    6 +-
 labs/android-jni-library/android-jni-library.tex   |    6 +-
 labs/android-native-app/android-native-app.tex     |    2 +-
 labs/android-new-board/android-new-board.tex       |   28 +-
 labs/android-source-code/android-source-code.tex   |   11 +-
 .../kernel-power-management.tex                    |    2 +-
 labs/setup/setup.tex                               |   15 +-
 .../sysdev-block-filesystems.tex                   |   10 +-
 .../sysdev-flash-filesystems.tex                   |    2 +-
 labs/sysdev-tinysystem/sysdev-tinysystem.tex       |    2 +-
 slides/about-us/about-us.tex                       |    2 +
 .../android-application-basics.tex                 |    8 +
 .../android-stack-apps.dia}                        |   18 +-
 .../android-build-system-basics.tex                |   14 +-
 .../android-build-system-modules.tex               |   12 +-
 .../android-framework-ipc.tex                      |    8 +
 .../android-stack-binder.dia}                      |  148 +-
 .../android-framework-java-services.tex            |    8 +
 .../android-stack-api.dia}                         |  143 +-
 .../android-framework-native-services.tex          |    2 +-
 ...ndroid-stack.dia => android-stack-services.dia} |  170 +-
 slides/android-kernel-changes-binder/binder.dia    |  499 ++-
 .../android-native-layer-bionic.tex                |    8 +
 .../android-stack-bionic.dia}                      |  458 ++-
 .../android-native-layer-daemons.tex               |    8 +
 .../android-stack-daemons.dia}                     |  354 +-
 .../android-native-layer-dalvik.tex                |    8 +
 .../android-stack-dalvik.dia}                      |  446 ++-
 .../android-native-layer-hal.tex                   |    8 +
 .../android-stack-hal.dia}                         |  450 +--
 .../android-native-layer-init.tex                  |    8 +
 .../android-stack-init.dia}                        |  437 ++-
 .../android-native-layer-jni.tex                   |    8 +
 .../android-stack-jni.dia}                         |  291 +-
 .../android-native-layer-toolbox.tex               |    7 +
 .../android-stack-toolbox.dia}                     |  460 ++-
 .../android-source-organization.tex                |    4 +
 slides/igepv2-board/igepv2-board.tex               |    5 +
 .../kernel-driver-development-debugging.tex        |    6 -
 .../setup-lab.tex}                                 |    0
 slides/sysdev-busybox/sysdev-busybox.tex           |    2 +-
 .../sysdev-dev-environment.tex                     |   10 -
 .../sysdev-embedded-linux.tex                      |    6 +-
 .../sysdev-linux-intro-configuration.tex           |    2 +-
 .../sysdev-linux-intro-sources.tex                 |   65 +-
 .../sysdev-root-filesystem-minimal.tex             |    3 +
 72 files changed, 8810 insertions(+), 3209 deletions(-)

diff --cc Makefile
index f90f98a,580be35..9e48063
--- a/Makefile
+++ b/Makefile
@@@ -21,9 -21,9 +21,9 @@@ KERNEL_SLIDES = 
  		kernel-introduction-title \
  		sysdev-linux-intro-features \
  		sysdev-linux-intro-versioning \
- 		kernel-introduction-lab \
+ 		setup-lab \
  		kernel-embedded-linux-usage-title \
 -		sysdev-linux-intro-sources \
 +		kernel-linux-intro-sources \
  		kernel-source-code-title \
  		kernel-source-code-drivers \
  		kernel-source-code-layout \



More information about the training-materials-updates mailing list