[FE training-materials-updates] Rename linux lab data folder to kernel for consistency
Maxime Ripard
maxime.ripard at free-electrons.com
Tue Jul 22 18:32:05 CEST 2014
Repository : git://git.free-electrons.com/training-materials.git
On branch : master
Link : http://git.free-electrons.com/training-materials/commit/?id=92d215f1c237224887134507d4859479206774a1
>---------------------------------------------------------------
commit 92d215f1c237224887134507d4859479206774a1
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date: Tue Jul 22 16:31:27 2014 +0200
Rename linux lab data folder to kernel for consistency
Every other resource/code we might have for this training is called kernel and
not linux. Remove this to be consistent with the rest of our documents
Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
>---------------------------------------------------------------
92d215f1c237224887134507d4859479206774a1
.../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
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 +-
39 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/lab-data/linux/bootloader/beaglebone-black/MBR b/lab-data/kernel/bootloader/beaglebone-black/MBR
similarity index 100%
rename from lab-data/linux/bootloader/beaglebone-black/MBR
rename to lab-data/kernel/bootloader/beaglebone-black/MBR
diff --git a/lab-data/linux/bootloader/beaglebone-black/MLO b/lab-data/kernel/bootloader/beaglebone-black/MLO
similarity index 100%
rename from lab-data/linux/bootloader/beaglebone-black/MLO
rename to lab-data/kernel/bootloader/beaglebone-black/MLO
diff --git a/lab-data/linux/bootloader/beaglebone-black/MLO.final b/lab-data/kernel/bootloader/beaglebone-black/MLO.final
similarity index 100%
rename from lab-data/linux/bootloader/beaglebone-black/MLO.final
rename to lab-data/kernel/bootloader/beaglebone-black/MLO.final
diff --git a/lab-data/linux/bootloader/beaglebone-black/README.txt b/lab-data/kernel/bootloader/beaglebone-black/README.txt
similarity index 100%
rename from lab-data/linux/bootloader/beaglebone-black/README.txt
rename to lab-data/kernel/bootloader/beaglebone-black/README.txt
diff --git a/lab-data/linux/bootloader/beaglebone-black/am335x-boneblack.dtb b/lab-data/kernel/bootloader/beaglebone-black/am335x-boneblack.dtb
similarity index 100%
rename from lab-data/linux/bootloader/beaglebone-black/am335x-boneblack.dtb
rename to lab-data/kernel/bootloader/beaglebone-black/am335x-boneblack.dtb
diff --git a/lab-data/linux/bootloader/beaglebone-black/src/0001-BBB-configuration-ignoring-eMMC.patch b/lab-data/kernel/bootloader/beaglebone-black/src/0001-BBB-configuration-ignoring-eMMC.patch
similarity index 100%
rename from lab-data/linux/bootloader/beaglebone-black/src/0001-BBB-configuration-ignoring-eMMC.patch
rename to lab-data/kernel/bootloader/beaglebone-black/src/0001-BBB-configuration-ignoring-eMMC.patch
diff --git a/lab-data/linux/bootloader/beaglebone-black/src/busybox-1.21.x.config b/lab-data/kernel/bootloader/beaglebone-black/src/busybox-1.21.x.config
similarity index 100%
rename from lab-data/linux/bootloader/beaglebone-black/src/busybox-1.21.x.config
rename to lab-data/kernel/bootloader/beaglebone-black/src/busybox-1.21.x.config
diff --git a/lab-data/linux/bootloader/beaglebone-black/src/linux-3.12-bone-black.config b/lab-data/kernel/bootloader/beaglebone-black/src/linux-3.12-bone-black.config
similarity index 100%
rename from lab-data/linux/bootloader/beaglebone-black/src/linux-3.12-bone-black.config
rename to lab-data/kernel/bootloader/beaglebone-black/src/linux-3.12-bone-black.config
diff --git a/lab-data/linux/bootloader/beaglebone-black/src/rootfs.tar.xz b/lab-data/kernel/bootloader/beaglebone-black/src/rootfs.tar.xz
similarity index 100%
rename from lab-data/linux/bootloader/beaglebone-black/src/rootfs.tar.xz
rename to lab-data/kernel/bootloader/beaglebone-black/src/rootfs.tar.xz
diff --git a/lab-data/linux/bootloader/beaglebone-black/u-boot.img b/lab-data/kernel/bootloader/beaglebone-black/u-boot.img
similarity index 100%
rename from lab-data/linux/bootloader/beaglebone-black/u-boot.img
rename to lab-data/kernel/bootloader/beaglebone-black/u-boot.img
diff --git a/lab-data/linux/bootloader/beaglebone-black/u-boot.img.final b/lab-data/kernel/bootloader/beaglebone-black/u-boot.img.final
similarity index 100%
rename from lab-data/linux/bootloader/beaglebone-black/u-boot.img.final
rename to lab-data/kernel/bootloader/beaglebone-black/u-boot.img.final
diff --git a/lab-data/linux/bootloader/beaglebone-black/uEnv.txt b/lab-data/kernel/bootloader/beaglebone-black/uEnv.txt
similarity index 100%
rename from lab-data/linux/bootloader/beaglebone-black/uEnv.txt
rename to lab-data/kernel/bootloader/beaglebone-black/uEnv.txt
diff --git a/lab-data/linux/bootloader/beaglebone-black/uImage b/lab-data/kernel/bootloader/beaglebone-black/uImage
similarity index 100%
rename from lab-data/linux/bootloader/beaglebone-black/uImage
rename to lab-data/kernel/bootloader/beaglebone-black/uImage
diff --git a/lab-data/linux/git.tar.xz b/lab-data/kernel/git.tar.xz
similarity index 100%
rename from lab-data/linux/git.tar.xz
rename to lab-data/kernel/git.tar.xz
diff --git a/lab-data/linux/modules/data/buildroot-2013.11.config b/lab-data/kernel/modules/data/buildroot-2013.11.config
similarity index 100%
rename from lab-data/linux/modules/data/buildroot-2013.11.config
rename to lab-data/kernel/modules/data/buildroot-2013.11.config
diff --git a/lab-data/linux/modules/data/busybox-1.21.x.config b/lab-data/kernel/modules/data/busybox-1.21.x.config
similarity index 100%
rename from lab-data/linux/modules/data/busybox-1.21.x.config
rename to lab-data/kernel/modules/data/busybox-1.21.x.config
diff --git a/lab-data/linux/modules/nfsroot.tar.xz b/lab-data/kernel/modules/nfsroot.tar.xz
similarity index 100%
rename from lab-data/linux/modules/nfsroot.tar.xz
rename to lab-data/kernel/modules/nfsroot.tar.xz
diff --git a/lab-data/linux/modules/nfsroot/root/debugging/Makefile b/lab-data/kernel/modules/nfsroot/root/debugging/Makefile
similarity index 100%
rename from lab-data/linux/modules/nfsroot/root/debugging/Makefile
rename to lab-data/kernel/modules/nfsroot/root/debugging/Makefile
diff --git a/lab-data/linux/modules/nfsroot/root/debugging/drvbroken.c b/lab-data/kernel/modules/nfsroot/root/debugging/drvbroken.c
similarity index 100%
rename from lab-data/linux/modules/nfsroot/root/debugging/drvbroken.c
rename to lab-data/kernel/modules/nfsroot/root/debugging/drvbroken.c
diff --git a/lab-data/linux/modules/nfsroot/root/hello/Makefile b/lab-data/kernel/modules/nfsroot/root/hello/Makefile
similarity index 100%
rename from lab-data/linux/modules/nfsroot/root/hello/Makefile
rename to lab-data/kernel/modules/nfsroot/root/hello/Makefile
diff --git a/lab-data/linux/modules/nfsroot/root/hello/hello_version.c b/lab-data/kernel/modules/nfsroot/root/hello/hello_version.c
similarity index 100%
rename from lab-data/linux/modules/nfsroot/root/hello/hello_version.c
rename to lab-data/kernel/modules/nfsroot/root/hello/hello_version.c
diff --git a/lab-data/linux/modules/nfsroot/root/nunchuk/Makefile b/lab-data/kernel/modules/nfsroot/root/nunchuk/Makefile
similarity index 100%
rename from lab-data/linux/modules/nfsroot/root/nunchuk/Makefile
rename to lab-data/kernel/modules/nfsroot/root/nunchuk/Makefile
diff --git a/lab-data/linux/modules/nfsroot/root/nunchuk/nunchuk.c b/lab-data/kernel/modules/nfsroot/root/nunchuk/nunchuk.c
similarity index 100%
rename from lab-data/linux/modules/nfsroot/root/nunchuk/nunchuk.c
rename to lab-data/kernel/modules/nfsroot/root/nunchuk/nunchuk.c
diff --git a/lab-data/linux/modules/nfsroot/root/serial/Makefile b/lab-data/kernel/modules/nfsroot/root/serial/Makefile
similarity index 100%
rename from lab-data/linux/modules/nfsroot/root/serial/Makefile
rename to lab-data/kernel/modules/nfsroot/root/serial/Makefile
diff --git a/lab-data/linux/modules/nfsroot/root/serial/feserial.c b/lab-data/kernel/modules/nfsroot/root/serial/feserial.c
similarity index 100%
rename from lab-data/linux/modules/nfsroot/root/serial/feserial.c
rename to lab-data/kernel/modules/nfsroot/root/serial/feserial.c
diff --git a/lab-data/linux/modules/nfsroot/root/serial/serial-get-counter.c b/lab-data/kernel/modules/nfsroot/root/serial/serial-get-counter.c
similarity index 100%
rename from lab-data/linux/modules/nfsroot/root/serial/serial-get-counter.c
rename to lab-data/kernel/modules/nfsroot/root/serial/serial-get-counter.c
diff --git a/lab-data/linux/modules/nfsroot/root/serial/serial-reset-counter.c b/lab-data/kernel/modules/nfsroot/root/serial/serial-reset-counter.c
similarity index 100%
rename from lab-data/linux/modules/nfsroot/root/serial/serial-reset-counter.c
rename to lab-data/kernel/modules/nfsroot/root/serial/serial-reset-counter.c
diff --git a/lab-data/linux/src/patches/0001-char-misc-assign-file-private_data-in-all-cases.patch b/lab-data/kernel/src/patches/0001-char-misc-assign-file-private_data-in-all-cases.patch
similarity index 100%
rename from lab-data/linux/src/patches/0001-char-misc-assign-file-private_data-in-all-cases.patch
rename to lab-data/kernel/src/patches/0001-char-misc-assign-file-private_data-in-all-cases.patch
diff --git a/labs/kernel-board-setup/kernel-board-setup.tex b/labs/kernel-board-setup/kernel-board-setup.tex
index 79f0e86..e80b5db 100644
--- a/labs/kernel-board-setup/kernel-board-setup.tex
+++ b/labs/kernel-board-setup/kernel-board-setup.tex
@@ -119,7 +119,7 @@ Some earlier versions do not support this.}
If you are doing these labs on your own (i.e. without participating to a Free Electrons
course), we ask you to install the U-Boot binary that we compiled and
-tested. See the \code{$HOME/felabs/linux/bootloader/beaglebone-black/README.txt}
+tested. See the \code{$HOME/felabs/kernel/bootloader/beaglebone-black/README.txt}
file for a simple way to do this.
To avoid trouble because of settings applied in previous practical labs,
diff --git a/labs/kernel-compiling-and-nfs-booting/kernel-compiling-and-nfs-booting.tex b/labs/kernel-compiling-and-nfs-booting/kernel-compiling-and-nfs-booting.tex
index f31dbdd..7bffc7e 100644
--- a/labs/kernel-compiling-and-nfs-booting/kernel-compiling-and-nfs-booting.tex
+++ b/labs/kernel-compiling-and-nfs-booting/kernel-compiling-and-nfs-booting.tex
@@ -38,7 +38,7 @@ accessed through the network by the target, using NFS.
\section{Setup}
-Go to the \code{$HOME/felabs/linux/src/linux} directory.
+Go to the \code{$HOME/felabs/kernel/src/linux} directory.
Install packages needed for configuring, compiling and booting
the kernel for your board:
@@ -116,7 +116,7 @@ of your board will be \code{192.168.0.100}:
\scriptsize
\begin{verbatim}
-/home/<user>/felabs/linux/modules/nfsroot 192.168.0.100(rw,no_root_squash,no_subtree_check)
+/home/<user>/felabs/kernel/modules/nfsroot 192.168.0.100(rw,no_root_squash,no_subtree_check)
\end{verbatim}
\normalsize
@@ -142,7 +142,7 @@ just one line, pay attention to the \code{O} character, like "OMAP", in
\begin{verbatim}
setenv bootargs root=/dev/nfs rw ip=192.168.0.100 console=ttyO0
- nfsroot=192.168.0.1:/home/<user>/felabs/linux/modules/nfsroot
+ nfsroot=192.168.0.1:/home/<user>/felabs/kernel/modules/nfsroot
saveenv
\end{verbatim}
diff --git a/labs/kernel-debugging/kernel-debugging.tex b/labs/kernel-debugging/kernel-debugging.tex
index 9eaa1f5..76eb0a6 100644
--- a/labs/kernel-debugging/kernel-debugging.tex
+++ b/labs/kernel-debugging/kernel-debugging.tex
@@ -61,7 +61,7 @@ that have been transmitted by your driver.
\subsection{Setup}
-Go to the \code{~/felabs/linux/modules/nfsroot/root/debugging/} directory.
+Go to the \code{~/felabs/kernel/modules/nfsroot/root/debugging/} directory.
Make sure your kernel is built with the following options:
@@ -101,7 +101,7 @@ If the function source code is not enough, then you can look at the
disassembled version of the function, either using:
\begin{verbatim}
-cd ~/felabs/linux/src/linux/
+cd ~/felabs/kernel/src/linux/
arm-linux-gnueabi-objdump -S vmlinux > vmlinux.disasm
\end{verbatim}
diff --git a/labs/kernel-git/kernel-git.tex b/labs/kernel-git/kernel-git.tex
index 5e2ba9b..021e94e 100644
--- a/labs/kernel-git/kernel-git.tex
+++ b/labs/kernel-git/kernel-git.tex
@@ -12,7 +12,7 @@ After this lab, you will be able to:
\section{Setup}
-Go to your kernel source tree in \code{~/felabs/linux/src/linux}
+Go to your kernel source tree in \code{~/felabs/kernel/src/linux}
\section{Exploring the history}
diff --git a/labs/kernel-i2c-communication/kernel-i2c-communication.tex b/labs/kernel-i2c-communication/kernel-i2c-communication.tex
index d3b3fbb..5020fa1 100644
--- a/labs/kernel-i2c-communication/kernel-i2c-communication.tex
+++ b/labs/kernel-i2c-communication/kernel-i2c-communication.tex
@@ -10,9 +10,9 @@ After this lab, you will be able to:
\section{Setup}
-Stay in the \code{~/felabs/linux/src/linux} directory for kernel and DTB
+Stay in the \code{~/felabs/kernel/src/linux} directory for kernel and DTB
compiling (stay in the \code{nunchuk} branch), and in
-\code{~/felabs/linux/modules/nfsroot/root/nunchuk} for module compiling
+\code{~/felabs/kernel/modules/nfsroot/root/nunchuk} for module compiling
(use two different terminals).
\section{Find pin muxing configuration information for i2c1}
diff --git a/labs/kernel-i2c-device-model/kernel-i2c-device-model.tex b/labs/kernel-i2c-device-model/kernel-i2c-device-model.tex
index 37943cb..ac7d494 100644
--- a/labs/kernel-i2c-device-model/kernel-i2c-device-model.tex
+++ b/labs/kernel-i2c-device-model/kernel-i2c-device-model.tex
@@ -16,7 +16,7 @@ device/driver match.
\section{Setup}
-Go to the \code{~/felabs/linux/src/linux} directory. Check out the
+Go to the \code{~/felabs/kernel/src/linux} directory. Check out the
\code{3.13.y} branch.
Now create a new \code{nunchuk} branch starting from the
@@ -134,7 +134,7 @@ It is now time to start writing the first building blocks of the I2C
driver for our nunchuk.
In a new terminal, go to
-\code{~/felabs/linux/modules/nfsroot/root/nunchuk/}. This directory
+\code{~/felabs/kernel/modules/nfsroot/root/nunchuk/}. This directory
contains a Makefile and an almost empty \code{nunchuk.c} file.
Now, you can compile your out-of-tree module by running \code{make}. As
diff --git a/labs/kernel-module-simple/kernel-module-simple.tex b/labs/kernel-module-simple/kernel-module-simple.tex
index e70ab10..6ddf351 100644
--- a/labs/kernel-module-simple/kernel-module-simple.tex
+++ b/labs/kernel-module-simple/kernel-module-simple.tex
@@ -12,7 +12,7 @@ After this lab, you will be able to:
\section{Setup}
-Go to the \code{~/felabs/linux/modules/nfsroot/root/hello} directory.
+Go to the \code{~/felabs/kernel/modules/nfsroot/root/hello} directory.
Boot your board if needed.
\section{Writing a module}
@@ -87,7 +87,7 @@ Run the \code{scripts/checkpatch.pl -h} command in the kernel sources,
to find which options are available. Now, run:
\begin{verbatim}
-~/felabs/linux/src/linux/scripts/checkpatch.pl --file --no-tree hello_version.c
+~/felabs/kernel/src/linux/scripts/checkpatch.pl --file --no-tree hello_version.c
\end{verbatim}
See how many violations are reported on your code. If there are
@@ -138,7 +138,7 @@ Then, commit your changes in the current branch (try to choose an
appropriate commit message):
\begin{verbatim}
-cd ~/felabs/linux/src/linux
+cd ~/felabs/kernel/src/linux
git add -A
git commit -as
\end{verbatim}
diff --git a/labs/kernel-serial-iomem/kernel-serial-iomem.tex b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
index c661de7..790e1f3 100644
--- a/labs/kernel-serial-iomem/kernel-serial-iomem.tex
+++ b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
@@ -76,7 +76,7 @@ Rebuild and update your DTB.
\section{Operate a platform device driver}
-Go to the \code{~/felabs/linux/modules/nfsroot/root/serial/} directory.
+Go to the \code{~/felabs/kernel/modules/nfsroot/root/serial/} directory.
You will find a \code{feserial.c} file which already provides a platform
driver skeleton.
diff --git a/labs/kernel-serial-output/kernel-serial-output.tex b/labs/kernel-serial-output/kernel-serial-output.tex
index 15dce78..62ed30a 100644
--- a/labs/kernel-serial-output/kernel-serial-output.tex
+++ b/labs/kernel-serial-output/kernel-serial-output.tex
@@ -108,7 +108,7 @@ weird assumptions about the {\em misc} framework.}
changes. Commit these if they correspond to useful changes (these
should be your Device Tree edits).
\item Apply the new patch using the following command:
- \code{git am ~/felabs/linux/src/patches/0001-char-misc*.patch}
+ \code{git am ~/felabs/kernel/src/patches/0001-char-misc*.patch}
\item Rebuild and update your kernel image and reboot.
\end{itemize}
diff --git a/labs/kernel-sources-download/kernel-sources-download.tex b/labs/kernel-sources-download/kernel-sources-download.tex
index 7a9adc9..3014e63 100644
--- a/labs/kernel-sources-download/kernel-sources-download.tex
+++ b/labs/kernel-sources-download/kernel-sources-download.tex
@@ -3,7 +3,7 @@ mainline Linux kernel source tree}
\section{Setup}
-Go to the \code{$HOME/felabs/linux/src} directory.
+Go to the \code{$HOME/felabs/kernel/src} directory.
\section{Installing git packages}
@@ -89,7 +89,7 @@ tree, and fetch only the commits which are specific to that remote tree.
{\footnotesize
\begin{verbatim}
-cd ~/felabs/linux/src/linux/
+cd ~/felabs/kernel/src/linux/
git remote add stable git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
git fetch stable
\end{verbatim}
diff --git a/labs/kernel-sources-exploring/kernel-sources-exploring.tex b/labs/kernel-sources-exploring/kernel-sources-exploring.tex
index d9408c5..ea392c7 100644
--- a/labs/kernel-sources-exploring/kernel-sources-exploring.tex
+++ b/labs/kernel-sources-exploring/kernel-sources-exploring.tex
@@ -22,7 +22,7 @@ running.
First, let's get the list of branches on our \code{stable} remote tree:
\begin{verbatim}
-cd ~/felabs/linux/src/linux
+cd ~/felabs/kernel/src/linux
git branch -a
\end{verbatim}
More information about the training-materials-updates
mailing list