[bootlin/training-materials updates] master: labs: change labboard value from "discovery" to "stm32mp1" (a424e2a2)
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Thu Sep 22 15:21:03 CEST 2022
Repository : https://github.com/bootlin/training-materials
On branch : master
Link : https://github.com/bootlin/training-materials/commit/a424e2a260de3a61ade96b82027880df02da7035
>---------------------------------------------------------------
commit a424e2a260de3a61ade96b82027880df02da7035
Author: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Date: Thu Sep 22 15:21:03 2022 +0200
labs: change labboard value from "discovery" to "stm32mp1"
Discovery is a bit vague, stm32mp1 is going to be clear for everybody.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
>---------------------------------------------------------------
a424e2a260de3a61ade96b82027880df02da7035
common/embedded-linux-labs-vars.tex | 2 +-
common/yocto-stm32-labs-vars.tex | 2 +-
labs/sysdev-buildroot/sysdev-buildroot.tex | 4 ++--
.../sysdev-kernel-cross-compiling.tex | 4 ++--
labs/sysdev-tinysystem/sysdev-tinysystem.tex | 2 +-
labs/sysdev-toolchain/sysdev-toolchain.tex | 4 ++--
labs/yocto-custom-machine/yocto-custom-machine.tex | 8 ++++----
labs/yocto-extend-recipe/yocto-extend-recipe.tex | 10 +++++-----
labs/yocto-layer/yocto-layer.tex | 4 ++--
9 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/common/embedded-linux-labs-vars.tex b/common/embedded-linux-labs-vars.tex
index 7b01df1d..7049bde4 100644
--- a/common/embedded-linux-labs-vars.tex
+++ b/common/embedded-linux-labs-vars.tex
@@ -1,6 +1,6 @@
\def\labbooktitle{Embedded Linux System Development}
\def\labbooksubtitle{STM32MP1 variant}
-\def\labboard{discovery}
+\def\labboard{stm32mp1}
\newcommand*{\workingkernel}{5.15}
\newcommand*{\labboarddescription}{STM32MP157D-DK1 Discovery kit}
\newcommand*{\zimageboardaddr}{0xc0000000}
diff --git a/common/yocto-stm32-labs-vars.tex b/common/yocto-stm32-labs-vars.tex
index 0b49a513..699a8a89 100644
--- a/common/yocto-stm32-labs-vars.tex
+++ b/common/yocto-stm32-labs-vars.tex
@@ -1,3 +1,3 @@
\def\labbooktitle{Yocto Project and OpenEmbedded Training}
\def\labbooksubtitle{STM32MP1 variant}
-\def\labboard{discovery}
+\def\labboard{stm32mp1}
diff --git a/labs/sysdev-buildroot/sysdev-buildroot.tex b/labs/sysdev-buildroot/sysdev-buildroot.tex
index a27b55db..5d19a962 100644
--- a/labs/sysdev-buildroot/sysdev-buildroot.tex
+++ b/labs/sysdev-buildroot/sysdev-buildroot.tex
@@ -118,7 +118,7 @@ button whenever you need more details about a given option:
\item \code{Target options}
\begin{itemize}
\item \code{Target Architecture}: \code{ARM (little endian)}
- \ifdefstring{\labboard}{discovery}{
+ \ifdefstring{\labboard}{stm32mp1}{
\item \code{Target Architecture Variant}: \code{cortex-A7}
}{
\ifdefstring{\labboard}{qemu}{
@@ -130,7 +130,7 @@ button whenever you need more details about a given option:
\item \code{Enable VFP extension support}: Enabled
}
\item \code{Target ABI}: \code{EABIhf}
- \ifdefstring{\labboard}{discovery}{
+ \ifdefstring{\labboard}{stm32mp1}{
\item \code{Floating point strategy}: \code{VFPv4}
}{
\ifdefstring{\labboard}{qemu}{
diff --git a/labs/sysdev-kernel-cross-compiling/sysdev-kernel-cross-compiling.tex b/labs/sysdev-kernel-cross-compiling/sysdev-kernel-cross-compiling.tex
index 8c4e5496..fb39b3ac 100644
--- a/labs/sysdev-kernel-cross-compiling/sysdev-kernel-cross-compiling.tex
+++ b/labs/sysdev-kernel-cross-compiling/sysdev-kernel-cross-compiling.tex
@@ -67,7 +67,7 @@ Also, don't forget to either:
\section{Linux kernel configuration}
-\ifdefstring{\labboard}{discovery}
+\ifdefstring{\labboard}{stm32mp1}
{
The standard configuration for this kernel is \code{multi_v7_defconfig},
but this will generate a pretty big kernel with support for many other
@@ -156,7 +156,7 @@ reset. Reset the board, and customize \code{bootcmd}:
Restart the board to make sure that booting the kernel is now automated.
-\ifdefstring{\labboard}{discovery}
+\ifdefstring{\labboard}{stm32mp1}
{
\section{Writing the kernel and DTB on the SD card}
diff --git a/labs/sysdev-tinysystem/sysdev-tinysystem.tex b/labs/sysdev-tinysystem/sysdev-tinysystem.tex
index 5012a429..30ba704d 100644
--- a/labs/sysdev-tinysystem/sysdev-tinysystem.tex
+++ b/labs/sysdev-tinysystem/sysdev-tinysystem.tex
@@ -219,7 +219,7 @@ suspend jobs.
So, to get rid of the warning message, we need \code{init} to run
\code{/bin/sh} in a real terminal device:
-\ifdefstring{\labboard}{discovery}{
+\ifdefstring{\labboard}{stm32mp1}{
\code{ttySTM0::askfirst:/bin/sh}
}{
\ifdefstring{\labboard}{qemu}{
diff --git a/labs/sysdev-toolchain/sysdev-toolchain.tex b/labs/sysdev-toolchain/sysdev-toolchain.tex
index 291f5be6..d0fa3e80 100644
--- a/labs/sysdev-toolchain/sysdev-toolchain.tex
+++ b/labs/sysdev-toolchain/sysdev-toolchain.tex
@@ -73,7 +73,7 @@ listed by using \code{./ct-ng list-samples}.
We will load the
\ifdefstring{\labboard}{qemu}{Cortex A9}{Cortex A5}
-sample\ifdefstring{\labboard}{discovery}{, as Crosstool-ng doesn't have
+sample\ifdefstring{\labboard}{stm32mp1}{, as Crosstool-ng doesn't have
any sample for Cortex A7 yet}. Load it with the \code{./ct-ng} command.
Then, to refine the configuration, let's run the \code{menuconfig} interface:
@@ -90,7 +90,7 @@ In \code{Path and misc options}:
something went wrong.
\end{itemize}
-\ifdefstring{\labboard}{discovery}{
+\ifdefstring{\labboard}{stm32mp1}{
In \code{Target options}:
\begin{itemize}
\item Set \code{Emit assembly for CPU} (\code{ARCH_CPU}) to \code{cortex-a7}.
diff --git a/labs/yocto-custom-machine/yocto-custom-machine.tex b/labs/yocto-custom-machine/yocto-custom-machine.tex
index cb690015..9f4004eb 100644
--- a/labs/yocto-custom-machine/yocto-custom-machine.tex
+++ b/labs/yocto-custom-machine/yocto-custom-machine.tex
@@ -10,17 +10,17 @@ During this lab, you will:
\section{Create a custom machine}
The machine file configures various hardware related settings. That's
-what we did in lab1, when we chose the \ifdefstring{\labboard}{discovery}
+what we did in lab1, when we chose the \ifdefstring{\labboard}{stm32mp1}
{\code{stm32mp1}} {\code{beaglebone}} one. While it
is not necessary to make our custom machine image here, we'll create a
new one to demonstrate the process.
Add a new \code{bootlinlabs} machine to the previously created layer, which
will make the
-\ifdefstring{\labboard}{discovery}{Discovery}{BeagleBone} properly
+\ifdefstring{\labboard}{stm32mp1}{Discovery}{BeagleBone} properly
boot.
-\if\defstring{\labboard}{discovery}
+\if\defstring{\labboard}{stm32mp1}
This machine describes a board using the \code{cortexa7thf-neon-vfpv4}
tune and is a part of the \code{stm32mp} SoC family. Add the following
lines to your machine configuration file:
@@ -49,7 +49,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc
This \code{bootlinlabs} machine needs:
-\if\defstring{\labboard}{discovery}
+\if\defstring{\labboard}{stm32mp1}
\begin{itemize}
\item To define a few variables to set to get the tooling from ST
Micro to work properly:
diff --git a/labs/yocto-extend-recipe/yocto-extend-recipe.tex b/labs/yocto-extend-recipe/yocto-extend-recipe.tex
index 20306264..6bc5adb2 100644
--- a/labs/yocto-extend-recipe/yocto-extend-recipe.tex
+++ b/labs/yocto-extend-recipe/yocto-extend-recipe.tex
@@ -20,7 +20,7 @@ extend some configuration variables of the original recipe.
Try to create an appended recipe with the help of the online Yocto
Project development documentation. You can find it at
\url{https://docs.yoctoproject.org/dev-manual/index.html}. We here
-aim to extend the \ifdefstring{\labboard}{discovery}{\code{linux-stm32mp}}
+aim to extend the \ifdefstring{\labboard}{stm32mp1}{\code{linux-stm32mp}}
{\code{linux-ti-staging}} kernel recipe.
You can see available \code{bbappend} files and the recipe they apply to by
@@ -31,7 +31,7 @@ bitbake-layers show-appends
If the BitBake append file you just created is recognized by your Yocto
environment, you should see:
-\if\defstring{\labboard}{discovery}
+\if\defstring{\labboard}{stm32mp1}
\begin{verbatim}
linux-stm32mp_5.15.bb:
$HOME/__SESSION_NAME__-labs/meta-bootlinlabs/recipes-kernel/linux/linux-stm32mp_5.15.bbappend
@@ -46,7 +46,7 @@ linux-ti-staging_5.10.bb:
\section{Add patches to apply in the recipe}
We want our extended
-\ifdefstring{\labboard}{discovery}{\code{linux-stm32mp}}
+\ifdefstring{\labboard}{stm32mp1}{\code{linux-stm32mp}}
{\code{linux-ti-staging}} kernel to support the Nunchuk as
a joystick input. We can add this by applying patches during the
\code{do_patch} task. The needed patches are provided with this lab. You can
@@ -64,7 +64,7 @@ list.
Try adding the patches included in this lab to your BitBake append
file. Do not forget to also add the \code{defconfig} file provided
alongside the patches. This file contains the kernel configuration.
-\if\defstring{\labboard}{discovery}
+\if\defstring{\labboard}{stm32mp1}
Add \code{KERNEL_DEFCONFIG = ""} and \code{KERNEL_EXTERNAL_DEFCONFIG =
"defconfig"} so it is used by the \code{linux-stm32mp} recipe.
\else
@@ -89,7 +89,7 @@ Identify the 4 pins of the Nunchuk connector:
\includegraphics[width=4cm]{common/nunchuk-pinout.pdf}
\end{center}
-\ifdefstring{\labboard}{discovery}{
+\ifdefstring{\labboard}{stm32mp1}{
Connect the Nunchuk pins:
\begin{itemize}
\item The \code{GND} pin to CN16 pin 6 (\code{GND})
diff --git a/labs/yocto-layer/yocto-layer.tex b/labs/yocto-layer/yocto-layer.tex
index f81f1b18..e2a5af34 100644
--- a/labs/yocto-layer/yocto-layer.tex
+++ b/labs/yocto-layer/yocto-layer.tex
@@ -39,8 +39,8 @@ check, and adapt if needed, the global layer configuration file located in the
\section{Integrate a layer to the build}
To be fair, we already used and integrated a layer in our build configuration
-during the first lab, with \ifdefstring{\labboard}{discovery}
-{\code{meta-st-stm32}} {\code{meta-ti}}. This layer was responsible for \ifdefstring{\labboard}{discovery} {\code{stm32mp1 DK1}} {\code{BeagleBone Black}} support in Yocto. We have to do the same for our
+during the first lab, with \ifdefstring{\labboard}{stm32mp1}
+{\code{meta-st-stm32}} {\code{meta-ti}}. This layer was responsible for \ifdefstring{\labboard}{stm32mp1} {\code{stm32mp1 DK1}} {\code{BeagleBone Black}} support in Yocto. We have to do the same for our
\code{meta-bootlinlabs} now.
There is a file which contains all the paths of the layers we use. Try to find it
More information about the training-materials-updates
mailing list