[bootlin/training-materials updates] master: labs/buildroot*: Use "bootlin" instead of "felabs" (c28b7633)
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Wed Apr 20 13:40:20 CEST 2022
Repository : https://github.com/bootlin/training-materials
On branch : master
Link : https://github.com/bootlin/training-materials/commit/c28b763355af135636ee987849ee74bbeb5c1473
>---------------------------------------------------------------
commit c28b763355af135636ee987849ee74bbeb5c1473
Author: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Date: Wed Apr 20 13:40:20 2022 +0200
labs/buildroot*: Use "bootlin" instead of "felabs"
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
>---------------------------------------------------------------
c28b763355af135636ee987849ee74bbeb5c1473
labs/buildroot-advanced/buildroot-advanced.tex | 12 +++----
labs/buildroot-appdev/buildroot-appdev.tex | 4 +--
.../buildroot-basic-stm32.tex | 6 ++--
labs/buildroot-basic/buildroot-basic.tex | 2 +-
.../buildroot-rootfs-stm32.tex | 36 ++++++++++----------
labs/buildroot-rootfs/buildroot-rootfs.tex | 38 +++++++++++-----------
6 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/labs/buildroot-advanced/buildroot-advanced.tex b/labs/buildroot-advanced/buildroot-advanced.tex
index 02844704..59c365fc 100644
--- a/labs/buildroot-advanced/buildroot-advanced.tex
+++ b/labs/buildroot-advanced/buildroot-advanced.tex
@@ -206,7 +206,7 @@ Your \code{BR2_EXTERNAL} tree should look like this:
\if\defstring{\labboard}{stm32mp1}
\begin{verbatim}
+-- board/
-| +-- felabs/
+| +-- bootlin/
| +-- stm32mp1/
| +-- linux.config
| +-- post-build.sh
@@ -227,7 +227,7 @@ Your \code{BR2_EXTERNAL} tree should look like this:
| +-- libfoo.mk
| +-- Config.in
+-- configs
-| +-- felabs_defconfig
+| +-- bootlin_defconfig
+-- Config.in
+-- external.desc
+-- external.mk
@@ -235,7 +235,7 @@ Your \code{BR2_EXTERNAL} tree should look like this:
\else
\begin{verbatim}
+-- board/
-| +-- felabs/
+| +-- bootlin/
| +-- beagleboneblack/
| +-- linux.config
| +-- post-build.sh
@@ -258,7 +258,7 @@ Your \code{BR2_EXTERNAL} tree should look like this:
| +-- libfoo.mk
| +-- Config.in
+-- configs
-| +-- felabs_defconfig
+| +-- bootlin_defconfig
+-- Config.in
+-- external.desc
+-- external.mk
@@ -281,12 +281,12 @@ create partitions. Follow those steps:
filesystem image
\item Take example on \code{board/stmicroelectronics/common/stm32mp157/genimage.cfg.template} to create
- your own \code{board/felabs/stm32mp1/genimage.cfg}. Keep only
+ your own \code{board/bootlin/stm32mp1/genimage.cfg}. Keep only
the single Device Tree we need for our project.
\item Adjust the Buildroot configuration to use the
\code{support/scripts/genimage.sh} script as a {\em post-image}
- script, and pass \code{-c board/felabs/stm32mp1/genimage.cfg}
+ script, and pass \code{-c board/bootlin/stm32mp1/genimage.cfg}
as {\em post-image} script arguments. Make sure to enable
\code{BR2_PACKAGE_HOST_GENIMAGE}.
diff --git a/labs/buildroot-appdev/buildroot-appdev.tex b/labs/buildroot-appdev/buildroot-appdev.tex
index 133af6c3..f236b14e 100644
--- a/labs/buildroot-appdev/buildroot-appdev.tex
+++ b/labs/buildroot-appdev/buildroot-appdev.tex
@@ -211,10 +211,10 @@ proper build system (Makefile, autotools, CMake, etc.).
When the package builds, you should see as the first step being done
that the \code{myapp} source code gets {\em rsynced} from
-\code{$(HOME)/felabs/myapp}:
+\code{$(HOME)/bootlin/myapp}:
\begin{verbatim}
->>> myapp custom Syncing from source dir /home/thomas/felabs/myapp
+>>> myapp custom Syncing from source dir /home/thomas/bootlin/myapp
\end{verbatim}
The build should now proceed to the end. Now, make a stupid but
diff --git a/labs/buildroot-basic-stm32/buildroot-basic-stm32.tex b/labs/buildroot-basic-stm32/buildroot-basic-stm32.tex
index c4a16da0..9153cb05 100644
--- a/labs/buildroot-basic-stm32/buildroot-basic-stm32.tex
+++ b/labs/buildroot-basic-stm32/buildroot-basic-stm32.tex
@@ -39,7 +39,7 @@ We're going to start a branch from the {\em 2021.02} Buildroot
release, with which this training has been tested.
\begin{bashinput}
-git checkout -b felabs 2021.02
+git checkout -b bootlin 2021.02
\end{bashinput}
\section{Configuring Buildroot}
@@ -154,7 +154,7 @@ Now, let's do the configuration:
which we are providing in
\code{$HOME/__SESSION_NAME__-labs/buildroot-basic/linux-stm32mp1.config}.
- Create the directory \code{board/felabs/stm32mp1} in the Buildroot
+ Create the directory \code{board/bootlin/stm32mp1} in the Buildroot
source tree. We will use it to store all the files that are
directly specific to our project. Copy the Linux kernel
configuration file to this location.
@@ -162,7 +162,7 @@ Now, let's do the configuration:
Then, tell Buildroot to use it as the Linux kernel configuration
file: choose \code{Using a custom (def)config fil} in \code{Kernel
configuration}, and set \code{Configuration file path} to
- \code{board/felabs/stm32mp1/linux-stm32mp1.config}.
+ \code{board/bootlin/stm32mp1/linux-stm32mp1.config}.
\item The \code{Kernel binary format} is the next option. Since we
are going to use a recent U-Boot bootloader, we'll keep the
diff --git a/labs/buildroot-basic/buildroot-basic.tex b/labs/buildroot-basic/buildroot-basic.tex
index 61842c5b..301bad86 100644
--- a/labs/buildroot-basic/buildroot-basic.tex
+++ b/labs/buildroot-basic/buildroot-basic.tex
@@ -40,7 +40,7 @@ We're going to start a branch from the {\em 2021.02} Buildroot
release, with which this training has been tested.
\begin{bashinput}
-git checkout -b felabs 2021.02
+git checkout -b bootlin 2021.02
\end{bashinput}
\section{Configuring Buildroot}
diff --git a/labs/buildroot-rootfs-stm32/buildroot-rootfs-stm32.tex b/labs/buildroot-rootfs-stm32/buildroot-rootfs-stm32.tex
index d9135ee8..d82ddab8 100644
--- a/labs/buildroot-rootfs-stm32/buildroot-rootfs-stm32.tex
+++ b/labs/buildroot-rootfs-stm32/buildroot-rootfs-stm32.tex
@@ -44,14 +44,14 @@ In order to automate the addition of this script to the root
filesystem as part of the Buildroot build, we will use the {\bf rootfs
overlay} mechanism. Since this {\em overlay} is specific to our
project, we will store it in our project specific directory,
-\code{board/felabs/stm32mp1}. Create
-\code{board/felabs/stm32mp1/rootfs-overlay/} to store the {\em rootfs
+\code{board/bootlin/stm32mp1}. Create
+\code{board/bootlin/stm32mp1/rootfs-overlay/} to store the {\em rootfs
overlay}, and in \code{menuconfig}, specify
-\code{board/felabs/stm32mp1/rootfs-overlay} as the {\em rootfs
+\code{board/bootlin/stm32mp1/rootfs-overlay} as the {\em rootfs
overlay} (option \code{BR2_ROOTFS_OVERLAY}).
Then, create a
-\code{board/felabs/stm32mp1/rootfs-overlay/etc/network/interfaces}
+\code{board/bootlin/stm32mp1/rootfs-overlay/etc/network/interfaces}
file with the following contents:
\begin{fileinput}
@@ -155,7 +155,7 @@ make linux-reinstall
\end{bashinput}
Then, we will create an \code{extlinux.conf} file as
-\code{board/felabs/stm32mp1/rootfs-overlay/boot/extlinux/extlinux.conf}
+\code{board/bootlin/stm32mp1/rootfs-overlay/boot/extlinux/extlinux.conf}
as follows:
{\small
@@ -231,7 +231,7 @@ will sit next to our {\em rootfs overlay} in our project-specific
directory:
\begin{bashinput}
-mkdir board/felabs/stm32mp1/patches/linux/
+mkdir board/bootlin/stm32mp1/patches/linux/
\end{bashinput}
Copy in this directory the two patches that we provided with the data
@@ -239,7 +239,7 @@ of this lab, in \code{$HOME/__SESSION_NAME__-labs/buildroot-rootfs/linux/}:
\begin{bashinput}
cp $HOME/__SESSION_NAME__-labs/buildroot-rootfs/linux/*.patch \
- board/felabs/stm32mp1/patches/linux/
+ board/bootlin/stm32mp1/patches/linux/
\end{bashinput}
The first patch adds the driver, the second patch adjusts the Device
@@ -250,7 +250,7 @@ which precisely covers the development of this driver.
Now, we need to tell Buildroot to apply these patches before building
the kernel. To do so, run \code{menuconfig}, go the to the {\em Build
options} menu, and adjust the \code{Global patch directories} option
-to \code{board/felabs/stm32mp1/patches/}.
+to \code{board/bootlin/stm32mp1/patches/}.
Let's now clean up completely the \code{linux} package so that its
sources will be re-extracted and our patches applied the next time we
@@ -276,7 +276,7 @@ This will:
\item Extract the Linux kernel sources
\item Apply our two patches
\item Load the current kernel configuration, from
- \code{board/felabs/stm32mp1/linux.config}
+ \code{board/bootlin/stm32mp1/linux.config}
\item Start the kernel \code{menuconfig} tool
\end{itemize}
@@ -291,7 +291,7 @@ Let's save persistently our kernel configuration change:
make linux-update-defconfig
\end{bashinput}
-You can check \code{board/felabs/stm32mp1/linux.config} and
+You can check \code{board/bootlin/stm32mp1/linux.config} and
verify that \kconfig{CONFIG_JOYSTICK_WIICHUCK} is set to \code{y}.
You can now restart the build of the kernel:
@@ -386,7 +386,7 @@ configuration is properly saved and cannot be lost. Go in
option called \code{Location to save buildroot config} which indicates
where Buildroot will save the {\em defconfig} file generated by
\code{make savedefconfig}. Adjust this value to
-\code{$(TOPDIR)/configs/felabs_defconfig}.
+\code{$(TOPDIR)/configs/bootlin_defconfig}.
Then, exit \code{menuconfig}, and run:
@@ -394,7 +394,7 @@ Then, exit \code{menuconfig}, and run:
make savedefconfig
\end{bashinput}
-Read the file \code{configs/felabs_defconfig} generated in the
+Read the file \code{configs/bootlin_defconfig} generated in the
Buildroot sources. You will see the values for all the options for
which we selected a value different from the default. So it's a very
good summary of what our system is.
@@ -420,18 +420,18 @@ To do so, create a build directory anywhere you want, and move inside
this directory:
\begin{bashinput}
-mkdir ~/felabs/buildroot-build/
-cd ~/felabs/buildroot-build/
+mkdir ~/bootlin/buildroot-build/
+cd ~/bootlin/buildroot-build/
\end{bashinput}
-Now, we will load the \code{felabs_defconfig}:
+Now, we will load the \code{bootlin_defconfig}:
\begin{bashinput}
-make -C ~/felabs/buildroot/ O=$(pwd) felabs_defconfig
+make -C ~/bootlin/buildroot/ O=$(pwd) bootlin_defconfig
\end{bashinput}
Let's explain a little bit what happens here. By using
-\code{-C ~/felabs/buildroot/}, we in fact tell \code{make} that the
+\code{-C ~/bootlin/buildroot/}, we in fact tell \code{make} that the
\code{Makefile} to analyze is not in the current directory, but in the
directory passed as the \code{-C} argument. By passing \code{O=}, we
tell Buildroot where all the output should go: by default it goes in
@@ -442,7 +442,7 @@ This command will have two main effects:
\begin{enumerate}
-\item It will load the \code{felabs_defconfig} as the current
+\item It will load the \code{bootlin_defconfig} as the current
configuration. After running the command, read the file named
\code{.config}. It's much longer than the {\em defconfig}, because
it contains the values for all options.
diff --git a/labs/buildroot-rootfs/buildroot-rootfs.tex b/labs/buildroot-rootfs/buildroot-rootfs.tex
index 1ed92b38..741ad266 100644
--- a/labs/buildroot-rootfs/buildroot-rootfs.tex
+++ b/labs/buildroot-rootfs/buildroot-rootfs.tex
@@ -68,16 +68,16 @@ In order to automate the addition of this script to the root
filesystem as part of the Buildroot build, we will use the {\bf rootfs
overlay} mechanism. Since this {\em overlay} is specific to our
project, we will create a custom directory for our project within the
-Buildroot sources: \code{board/felabs/beagleboneblack/}.
+Buildroot sources: \code{board/bootlin/beagleboneblack/}.
Within this directory, create a \code{rootfs-overlay} directory, and
in \code{menuconfig}, specify
-\code{board/felabs/beagleboneblack/rootfs-overlay} as the {\em rootfs
+\code{board/bootlin/beagleboneblack/rootfs-overlay} as the {\em rootfs
overlay} (option \code{BR2_ROOTFS_OVERLAY}).
Copy the \code{S30usbgadget} script to your overlay so that it is
located in
-\code{board/felabs/beagleboneblack/rootfs-overlay/etc/init.d/S30usbgadget}. At
+\code{board/bootlin/beagleboneblack/rootfs-overlay/etc/init.d/S30usbgadget}. At
boot time, the default init system used by Buildroot will execute all
scripts named \code{SXX*} in \code{/etc/init.d}.
@@ -85,7 +85,7 @@ scripts named \code{SXX*} in \code{/etc/init.d}.
By default, Buildroot uses the \code{ifup} program from BusyBox, which
reads the \code{/etc/network/interfaces} file to configure network
-interfaces. So, in \code{board/felabs/beagleboneblack/rootfs-overlay},
+interfaces. So, in \code{board/bootlin/beagleboneblack/rootfs-overlay},
create a file named \code{etc/network/interfaces} with the following
contents:
@@ -222,13 +222,13 @@ changes persistently. To do so:
{\em defconfig} that comes with the kernel sources.
\item In the \code{Configuration file path}, enter
- \code{board/felabs/beagleboneblack/linux.config}.
+ \code{board/bootlin/beagleboneblack/linux.config}.
\item Exit \code{menuconfig}
\item Run \inlinebash{make linux-update-defconfig}. This will generate the
configuration file in
- \code{board/felabs/beagleboneblack/linux.config}. It will be a {\em
+ \code{board/bootlin/beagleboneblack/linux.config}. It will be a {\em
minimal} configuration file (i.e a {\em defconfig}). In this file,
verify that the option \kconfig{CONFIG_HW_RANDOM}is properly set to
\code{y}. The other two options are not visible in the
@@ -266,7 +266,7 @@ will sit next to our {\em rootfs overlay} in our project-specific
directory:
\begin{bashinput}
-mkdir board/felabs/beagleboneblack/patches/linux/
+mkdir board/bootlin/beagleboneblack/patches/linux/
\end{bashinput}
Copy in this directory the two patches that we provided with the data
@@ -274,7 +274,7 @@ of this lab, in \code{$HOME/__SESSION_NAME__-labs/buildroot-rootfs/linux/}:
\begin{bashinput}
cp $HOME/__SESSION_NAME__-labs/buildroot-rootfs/linux/*.patch \
- board/felabs/beagleboneblack/patches/linux/
+ board/bootlin/beagleboneblack/patches/linux/
\end{bashinput}
The first patch adds the driver, the second patch adjusts the Device
@@ -285,7 +285,7 @@ which precisely covers the development of this driver.
Now, we need to tell Buildroot to apply these patches before building
the kernel. To do so, run \code{menuconfig}, go the to the {\em Build
options} menu, and adjust the \code{Global patch directories} option
-to \code{board/felabs/beagleboneblack/patches/}.
+to \code{board/bootlin/beagleboneblack/patches/}.
Let's now clean up completely the \code{linux} package so that its
sources will be re-extracted and our patches applied the next time we
@@ -311,7 +311,7 @@ This will:
\item Extract the Linux kernel sources
\item Apply our two patches
\item Load the current kernel configuration, from
- \code{board/felabs/beagleboneblack/linux.config} as we have modified
+ \code{board/bootlin/beagleboneblack/linux.config} as we have modified
earlier in this lab.
\item Start the kernel \code{menuconfig} tool
\end{itemize}
@@ -328,7 +328,7 @@ Let's save persistently our kernel configuration change:
make linux-update-defconfig
\end{bashinput}
-You can check \code{board/felabs/beagleboneblack/linux.config} and
+You can check \code{board/bootlin/beagleboneblack/linux.config} and
verify that \kconfig{CONFIG_JOYSTICK_WIICHUCK} is set to \code{y}.
You can now restart the build of the kernel:
@@ -419,7 +419,7 @@ configuration is properly saved and cannot be lost. Go in
option called \code{Location to save buildroot config} which indicates
where Buildroot will save the {\em defconfig} file generated by
\code{make savedefconfig}. Adjust this value to
-\code{$(TOPDIR)/configs/felabs_defconfig}.
+\code{$(TOPDIR)/configs/bootlin_defconfig}.
Then, exit \code{menuconfig}, and run:
@@ -427,7 +427,7 @@ Then, exit \code{menuconfig}, and run:
make savedefconfig
\end{bashinput}
-Read the file \code{configs/felabs_defconfig} generated in the
+Read the file \code{configs/bootlin_defconfig} generated in the
Buildroot sources. You will see the values for all the options for
which we selected a value different from the default. So it's a very
good summary of what our system is.
@@ -453,18 +453,18 @@ To do so, create a build directory anywhere you want, and move inside
this directory:
\begin{bashinput}
-mkdir ~/felabs/buildroot-build/
-cd ~/felabs/buildroot-build/
+mkdir ~/bootlin/buildroot-build/
+cd ~/bootlin/buildroot-build/
\end{bashinput}
-Now, we will load the \code{felabs_defconfig}:
+Now, we will load the \code{bootlin_defconfig}:
\begin{bashinput}
-make -C ~/felabs/buildroot/ O=$(pwd) felabs_defconfig
+make -C ~/bootlin/buildroot/ O=$(pwd) bootlin_defconfig
\end{bashinput}
Let's explain a little bit what happens here. By using
-\code{-C ~/felabs/buildroot/}, we in fact tell \code{make} that the
+\code{-C ~/bootlin/buildroot/}, we in fact tell \code{make} that the
\code{Makefile} to analyze is not in the current directory, but in the
directory passed as the \code{-C} argument. By passing \code{O=}, we
tell Buildroot where all the output should go: by default it goes in
@@ -475,7 +475,7 @@ This command will have two main effects:
\begin{enumerate}
-\item It will load the \code{felabs_defconfig} as the current
+\item It will load the \code{bootlin_defconfig} as the current
configuration. After running the command, read the file named
\code{.config}. It's much longer than the {\em defconfig}, because
it contains the values for all options.
More information about the training-materials-updates
mailing list