[bootlin/training-materials updates] master: yocto: lab6: upgrade to kirkstone (stm32 boards) (e54496f3)

[Luca Ceresoli]

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

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

commit e54496f34fe26259a6afb0ae21b324995a550dc0
Author: Luca Ceresoli <luca.ceresoli at bootlin.com>
Date:   Tue Jul 12 17:26:42 2022 +0200

    yocto: lab6: upgrade to kirkstone (stm32 boards)
    
    Update the required MACHINE configuration variables, taking the minimum
    required from the ST layer.
    
    Let's stop having a shared feature list because for ST boards we now need
    the m4copro MACHINE_FEATURE to avoid this nasty error:
    
      ERROR: st-image-userfs-1.0-r0 do_rootfs: Could not invoke dnf. Command '[...]' returned 1:
      DNF version: 4.11.1
      cachedir: .../tmp/work/bootlinlabs-poky-linux-gnueabi/st-image-userfs/1.0-r0/rootfs/var/cache/dnf
      Added oe-repo repo from .../tmp/work/bootlinlabs-poky-linux-gnueabi/st-image-userfs/1.0-r0/oe-rootfs-repo
      User-Agent: falling back to 'libdnf': could not detect OS or basearch
      repo: using cache for: oe-repo
      oe-repo: using metadata from Tue 12 Jul 2022 03:07:21 PM UTC.
      --> Starting dependency resolution
      --> Finished dependency resolution
      Error:
       Problem: conflicting requests
        - nothing provides /bin/sh needed by linux-examples-stm32mp1-userfs-5.4+0+8e1c0b246c-r0.bootlinlabs
      (try to add '--skip-broken' to skip uninstallable packages)
    
    Signed-off-by: Luca Ceresoli <luca.ceresoli at bootlin.com>


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

e54496f34fe26259a6afb0ae21b324995a550dc0
 labs/yocto-custom-machine/yocto-custom-machine.tex | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/labs/yocto-custom-machine/yocto-custom-machine.tex b/labs/yocto-custom-machine/yocto-custom-machine.tex
index a64ac099..03a065c0 100644
--- a/labs/yocto-custom-machine/yocto-custom-machine.tex
+++ b/labs/yocto-custom-machine/yocto-custom-machine.tex
@@ -30,7 +30,7 @@ require conf/machine/include/st-machine-common-stm32mp.inc
 require conf/machine/include/st-machine-providers-stm32mp.inc
 
 DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
-require conf/machine/include/tune-cortexa7.inc
+require conf/machine/include/arm/armv7a/tune-cortexa7.inc
 \end{verbatim}
 \else
 This machine describes a board using the \code{cortexa8thf-neon} tune
@@ -53,12 +53,10 @@ This \code{bootlinlabs} machine needs:
   \item To define a few variables to set to get the tooling from ST
     Micro to work properly:
 \begin{verbatim}
-BOOTSCHEME_LABELS += "trusted"
-STM32MP_DT_FILES_DK += "stm32mp157d-dk1"
-ST_KERNEL_LOADADDR   = "0xC2000040"
-FLASHLAYOUT_CONFIG_LABELS += "sdcard"
-PARTITIONS_CONFIG = "bootfs rootfs"
+UBOOT_CONFIG = "trusted_stm32mp15"
+STM32MP_DT_FILES_DK = "stm32mp157a-dk1 stm32mp157d-dk1"
 \end{verbatim}
+  \item To support the \code{m4copro} feature
 \else
 \begin{itemize}
   \item To select \code{linux-ti-staging} as the preferred provider
@@ -73,8 +71,7 @@ PARTITIONS_CONFIG = "bootfs rootfs"
     address.
   \item To use a \code{zImage} kernel image type.
   \item To configure the serial console to \code{115200 ttyS0}
-\fi
-  \item And to support some features:
+  \item To support some features:
     \begin{itemize}
       \item apm
       \item usbgadget
@@ -83,6 +80,7 @@ PARTITIONS_CONFIG = "bootfs rootfs"
       \item ext2
       \item alsa
     \end{itemize}
+\fi
 \end{itemize}
 \section{Build an image with the new machine}