[bootlin/training-materials updates] master: yocto-stm32: update to zeus, first pass (25e49cac)

Alexandre Belloni alexandre.belloni at bootlin.com
Wed Jun 10 00:45:34 CEST 2020


Repository : https://github.com/bootlin/training-materials
On branch  : master
Link       : https://github.com/bootlin/training-materials/commit/25e49cac3a20530111ee765fbb6e19aa432a3de2

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

commit 25e49cac3a20530111ee765fbb6e19aa432a3de2
Author: Alexandre Belloni <alexandre.belloni at bootlin.com>
Date:   Wed Jun 10 00:45:34 2020 +0200

    yocto-stm32: update to zeus, first pass
    
    Signed-off-by: Alexandre Belloni <alexandre.belloni at bootlin.com>


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

25e49cac3a20530111ee765fbb6e19aa432a3de2
 .../linux/0002-ARM-dts-stm32mp157a-dk1-add-nunchuk.patch       |  4 ++--
 .../yocto-advanced-configuration-stm32.tex                     |  4 ++--
 labs/yocto-extend-recipe/yocto-extend-recipe.tex               | 10 +++++++---
 labs/yocto-first-build-stm32/yocto-first-build-stm32.tex       |  7 +++----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lab-data/yocto-stm32/bootlin-lab-data/nunchuk/linux/0002-ARM-dts-stm32mp157a-dk1-add-nunchuk.patch b/lab-data/yocto-stm32/bootlin-lab-data/nunchuk/linux/0002-ARM-dts-stm32mp157a-dk1-add-nunchuk.patch
index 5e8f6c1a..b64303c0 100644
--- a/lab-data/yocto-stm32/bootlin-lab-data/nunchuk/linux/0002-ARM-dts-stm32mp157a-dk1-add-nunchuk.patch
+++ b/lab-data/yocto-stm32/bootlin-lab-data/nunchuk/linux/0002-ARM-dts-stm32mp157a-dk1-add-nunchuk.patch
@@ -12,8 +12,8 @@ diff --git a/arch/arm/boot/dts/stm32mp157a-dk1.dts b/arch/arm/boot/dts/stm32mp15
 index e3a36d3cdb45..97df04c5b1a0 100644
 --- a/arch/arm/boot/dts/stm32mp157a-dk1.dts
 +++ b/arch/arm/boot/dts/stm32mp157a-dk1.dts
-@@ -448,6 +448,19 @@
- 	};
+@@ -463,6 +463,19 @@
+ 	status = "disabled";
  };
  
 +&i2c5 {
diff --git a/labs/yocto-advanced-configuration-stm32/yocto-advanced-configuration-stm32.tex b/labs/yocto-advanced-configuration-stm32/yocto-advanced-configuration-stm32.tex
index 910dda7d..2eb77af0 100644
--- a/labs/yocto-advanced-configuration-stm32/yocto-advanced-configuration-stm32.tex
+++ b/labs/yocto-advanced-configuration-stm32/yocto-advanced-configuration-stm32.tex
@@ -23,7 +23,7 @@ card and change the \code{APPEND} line for the
 \code{stm32mp157a-dk1-sdcard} configuration:
 
 \begin{verbatim}
-APPEND root=/dev/nfs rw console=ttySTM0,115200 nfsroot=192.168.0.1:/nfs ip=192.168.0.100:::::eth0
+APPEND root=/dev/nfs rw console=ttySTM0,115200 nfsroot=192.168.0.1:/nfs,vers=3,tcp ip=192.168.0.100:::::eth0
 \end{verbatim}
 
 \section{Set up the Ethernet communication on the workstation}
@@ -95,7 +95,7 @@ sudo tar xpf $BUILDDIR/tmp/deploy/images/stm32mp1/\
 Then boot the board.
 
 The Dropbear SSH server was enabled a few steps before, and should now be
-running as a service on the BeagleBone Black. You can test it by accessing the
+running as a service on the Discovery. You can test it by accessing the
 board through SSH:
 \begin{verbatim}
 ssh root at 192.168.0.100
diff --git a/labs/yocto-extend-recipe/yocto-extend-recipe.tex b/labs/yocto-extend-recipe/yocto-extend-recipe.tex
index 20c6bdaf..29eb7414 100644
--- a/labs/yocto-extend-recipe/yocto-extend-recipe.tex
+++ b/labs/yocto-extend-recipe/yocto-extend-recipe.tex
@@ -63,9 +63,13 @@ 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 and
-is handled automatically in the \ifdefstring{\labboard}{discovery}{\code{linux-stm32mp}}
-{\code{linux-ti-staging}} original recipe.
+alongside the patches. This file contains the kernel configuration.
+\if\defstring{\labboard}{discovery}
+Add \code{KERNEL_DEFCONFIG = ""} and \code{KERNEL_EXTERNAL_DEFCONFIG =
+"defconfig"} so it is used by the \code{linux-stm32mp} recipe.
+\else
+It is handled automatically in the \code{linux-ti-staging} original recipe.
+\fi
 
 You can now rebuild the kernel to take the new patches into account:
 \begin{verbatim}
diff --git a/labs/yocto-first-build-stm32/yocto-first-build-stm32.tex b/labs/yocto-first-build-stm32/yocto-first-build-stm32.tex
index 6dd94293..584e14af 100644
--- a/labs/yocto-first-build-stm32/yocto-first-build-stm32.tex
+++ b/labs/yocto-first-build-stm32/yocto-first-build-stm32.tex
@@ -27,16 +27,15 @@ Download the \code{thud} version of Poky:
 \begin{verbatim}
 git clone git://git.yoctoproject.org/poky.git
 cd $HOME/__SESSION_NAME__-labs/poky
-git checkout -b thud-20.0.2 thud-20.0.2
+git checkout -b zeus-22.0.3 zeus-22.0.3
 \end{verbatim}
 
 Return to your project root directory (\code{cd $HOME/__SESSION_NAME__-labs/})
 and download the OpenEmbedded and STM32MP layers:
 \begin{verbatim}
-git clone -b thud git://git.openembedded.org/meta-openembedded
-git clone https://github.com/STMicroelectronics/meta-st-stm32mp.git
+git clone -b zeus git://git.openembedded.org/meta-openembedded
+git clone -b zeus https://github.com/STMicroelectronics/meta-st-stm32mp.git
 cd meta-st-stm32mp/
-git checkout thud
 git am $HOME/__SESSION_NAME__-labs/bootlin-lab-data/0001-u-boot-update-config.patch
 \end{verbatim}
 




More information about the training-materials-updates mailing list