[bootlin/training-materials updates] master: embedded-linux: improve description of DT files (86d39963)

[Michael Opdenacker]

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

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

commit 86d39963e928906a46bccd7dfb2230dad7ace704
Author: Michael Opdenacker <michael.opdenacker at bootlin.com>
Date:   Thu Dec 15 12:05:34 2022 +0100

    embedded-linux: improve description of DT files
    
    Replacing \dtbname by \dtname and removing the ".dtb"
    extension from it. This allows to refer to the corresponding
    DTS files too.
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at bootlin.com>


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

86d39963e928906a46bccd7dfb2230dad7ace704
 common/embedded-linux-bbb-labs-vars.tex                             | 2 +-
 common/embedded-linux-labs-vars.tex                                 | 2 +-
 common/embedded-linux-qemu-labs-vars.tex                            | 2 +-
 labs/sysdev-block-filesystems-bbb/sysdev-block-filesystems-bbb.tex  | 2 +-
 .../sysdev-block-filesystems-stm32.tex                              | 2 +-
 .../sysdev-kernel-cross-compiling/sysdev-kernel-cross-compiling.tex | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/embedded-linux-bbb-labs-vars.tex b/common/embedded-linux-bbb-labs-vars.tex
index 61aae4df..fce94416 100644
--- a/common/embedded-linux-bbb-labs-vars.tex
+++ b/common/embedded-linux-bbb-labs-vars.tex
@@ -5,7 +5,7 @@
 \newcommand*{\labboarddescription}{BeagleBone Black}
 \newcommand*{\zimageboardaddr}{0x81000000}
 \newcommand*{\dtbboardaddr}{0x82000000}
-\newcommand*{\dtbname}{am335x-boneblack.dtb}
+\newcommand*{\dtname}{am335x-boneblack}
 \newcommand*{\hosttty}{/dev/ttyUSB0}
 \newcommand*{\ttyname}{ttyS0}
 \newcommand*{\console}{\ttyname,115200n8}
diff --git a/common/embedded-linux-labs-vars.tex b/common/embedded-linux-labs-vars.tex
index e2a5c5c4..f0270fbb 100644
--- a/common/embedded-linux-labs-vars.tex
+++ b/common/embedded-linux-labs-vars.tex
@@ -5,7 +5,7 @@
 \newcommand*{\labboarddescription}{STM32MP157D-DK1 Discovery kit}
 \newcommand*{\zimageboardaddr}{0xc0000000}
 \newcommand*{\dtbboardaddr}{0xc4000000}
-\newcommand*{\dtbname}{stm32mp157a-dk1.dtb}
+\newcommand*{\dtname}{stm32mp157a-dk1}
 \newcommand*{\hosttty}{/dev/ttyACM0}
 \newcommand*{\ttyname}{ttySTM0}
 \newcommand*{\console}{\ttyname,115200}
diff --git a/common/embedded-linux-qemu-labs-vars.tex b/common/embedded-linux-qemu-labs-vars.tex
index 243f331b..bacf6368 100644
--- a/common/embedded-linux-qemu-labs-vars.tex
+++ b/common/embedded-linux-qemu-labs-vars.tex
@@ -5,6 +5,6 @@
 \newcommand*{\labboarddescription}{QEMU ARM Versatile Express for Cortex-A9}
 \newcommand*{\zimageboardaddr}{0x61000000}
 \newcommand*{\dtbboardaddr}{0x62000000}
-\newcommand*{\dtbname}{vexpress-v2p-ca9.dtb}
+\newcommand*{\dtname}{vexpress-v2p-ca9}
 \newcommand*{\ttyname}{ttyAMA0}
 \newcommand*{\console}{\ttyname}
diff --git a/labs/sysdev-block-filesystems-bbb/sysdev-block-filesystems-bbb.tex b/labs/sysdev-block-filesystems-bbb/sysdev-block-filesystems-bbb.tex
index 71efab76..10934e38 100644
--- a/labs/sysdev-block-filesystems-bbb/sysdev-block-filesystems-bbb.tex
+++ b/labs/sysdev-block-filesystems-bbb/sysdev-block-filesystems-bbb.tex
@@ -144,7 +144,7 @@ able to load the DTB and kernel image from the SD card and boot with:
 
 \begin{ubootinput}
 => load mmc 0:1 %\zimageboardaddr% zImage
-=> load mmc 0:1 %\dtbboardaddr% %\dtbname%
+=> load mmc 0:1 %\dtbboardaddr% %\dtname%-custom.dtb
 => bootz %\zimageboardaddr% - %\dtbboardaddr%
 \end{ubootinput}
 
diff --git a/labs/sysdev-block-filesystems-stm32/sysdev-block-filesystems-stm32.tex b/labs/sysdev-block-filesystems-stm32/sysdev-block-filesystems-stm32.tex
index 94e4af76..84140a20 100644
--- a/labs/sysdev-block-filesystems-stm32/sysdev-block-filesystems-stm32.tex
+++ b/labs/sysdev-block-filesystems-stm32/sysdev-block-filesystems-stm32.tex
@@ -151,7 +151,7 @@ able to load the DTB and kernel image from the SD card and boot with:
 
 \begin{ubootinput}
 => load mmc 0:4 %\zimageboardaddr% zImage
-=> load mmc 0:4 %\dtbboardaddr% %\dtbname%
+=> load mmc 0:4 %\dtbboardaddr% %\dtname%-custom.dtb
 => bootz %\zimageboardaddr% - %\dtbboardaddr%
 \end{ubootinput}
 
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 6b86b60a..920f2b94 100644
--- a/labs/sysdev-kernel-cross-compiling/sysdev-kernel-cross-compiling.tex
+++ b/labs/sysdev-kernel-cross-compiling/sysdev-kernel-cross-compiling.tex
@@ -165,7 +165,7 @@ We will use TFTP to load the kernel image on the board:
 \begin{itemize}
 
 \item On your workstation, copy the \code{zImage} and DTB
-(\texttt\dtbname) to the directory exposed by the TFTP server.
+(\texttt{\dtname}\texttt{.dtb}) to the directory exposed by the TFTP server.
 
 \item On the target (in the U-Boot prompt), load \code{zImage} from
 TFTP into RAM:
@@ -175,7 +175,7 @@ TFTP into RAM:
 
 \item Now, also load the DTB file into RAM:
 \begin{ubootinput}
-=> tftp %\dtbboardaddr% %\dtbname%
+=> tftp %\dtbboardaddr% %\dtname%.dtb
 \end{ubootinput}
 
 \item Boot the kernel with its device tree:
@@ -192,7 +192,7 @@ You can now automate all this every time the board is booted or
 reset. Reset the board, and customize \code{bootcmd}:
 
 \begin{ubootinput}
-=> setenv bootcmd 'tftp %\zimageboardaddr\ zImage; tftp \dtbboardaddr\ \dtbname; bootz \zimageboardaddr\ - \dtbboardaddr'%
+=> setenv bootcmd 'tftp %\zimageboardaddr\ zImage; tftp \dtbboardaddr\ {\dtname}.dtb; bootz \zimageboardaddr\ - \dtbboardaddr'%
 => saveenv
 \end{ubootinput}