[bootlin/training-materials updates] master: embedded-linux: introduce "console" setting (88e746d4)

[Michael Opdenacker]

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

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

commit 88e746d42677b3c96676334e325ebf885baa4669
Author: Michael Opdenacker <michael.opdenacker at bootlin.com>
Date:   Wed Jul 20 19:18:54 2022 +0200

    embedded-linux: introduce "console" setting
    
    To distinguish between the raw tty device, and the console=
    setting in the kernel command line, which could include
    baud rate and parity settings.
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at bootlin.com>


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

88e746d42677b3c96676334e325ebf885baa4669
 common/embedded-linux-4d-labs-vars.tex                               | 3 ++-
 common/embedded-linux-labs-vars.tex                                  | 1 +
 common/embedded-linux-qemu-labs-vars.tex                             | 1 +
 labs/sysdev-kernel-cross-compiling/sysdev-kernel-cross-compiling.tex | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/embedded-linux-4d-labs-vars.tex b/common/embedded-linux-4d-labs-vars.tex
index 25a9345b..da001c58 100644
--- a/common/embedded-linux-4d-labs-vars.tex
+++ b/common/embedded-linux-4d-labs-vars.tex
@@ -7,4 +7,5 @@
 \newcommand*{\zimageboardaddr}{0xc0000000}
 \newcommand*{\dtbboardaddr}{0xc4000000}
 \newcommand*{\dtbname}{stm32mp157a-dk1.dtb}
-\newcommand*{\ttyname}{ttySTM0,115200}
+\newcommand*{\ttyname}{ttySTM0}
+\newcommand*{\console}{\ttyname,115200}
diff --git a/common/embedded-linux-labs-vars.tex b/common/embedded-linux-labs-vars.tex
index 3d2638fe..0ba96294 100644
--- a/common/embedded-linux-labs-vars.tex
+++ b/common/embedded-linux-labs-vars.tex
@@ -8,4 +8,5 @@
 \newcommand*{\dtbboardaddr}{0x22000000}
 \newcommand*{\dtbname}{at91-sama5d3\_xplained.dtb}
 \newcommand*{\ttyname}{ttyS0}
+\newcommand*{\console}{\ttyname}
 
diff --git a/common/embedded-linux-qemu-labs-vars.tex b/common/embedded-linux-qemu-labs-vars.tex
index d4c1acf4..fc89479c 100644
--- a/common/embedded-linux-qemu-labs-vars.tex
+++ b/common/embedded-linux-qemu-labs-vars.tex
@@ -8,3 +8,4 @@
 \newcommand*{\dtbboardaddr}{0x62000000}
 \newcommand*{\dtbname}{vexpress-v2p-ca9.dtb}
 \newcommand*{\ttyname}{ttyAMA0}
+\newcommand*{\console}{\ttyname}
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 06a9093d..c4204fac 100644
--- a/labs/sysdev-kernel-cross-compiling/sysdev-kernel-cross-compiling.tex
+++ b/labs/sysdev-kernel-cross-compiling/sysdev-kernel-cross-compiling.tex
@@ -94,7 +94,7 @@ we need to set the \code{bootargs} environment corresponding
 to the Linux kernel command line:
 
 \begin{ubootinput}
-=> setenv bootargs console=%\ttyname%
+=> setenv bootargs console=%\console%
 => saveenv
 \end{ubootinput}
 We will use TFTP to load the kernel image on the board: