[bootlin/training-materials updates] master: slides/[sysdev|kernel]-hw-devices: correct statement (4e2aa51c)

Michael Opdenacker michael.opdenacker at bootlin.com
Tue Apr 4 11:26:25 CEST 2023


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

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

commit 4e2aa51c8142f4c99363e229b199be5893bb88e2
Author: Michael Opdenacker <michael.opdenacker at bootlin.com>
Date:   Tue Apr 4 11:26:25 2023 +0200

    slides/[sysdev|kernel]-hw-devices: correct statement
    
    An including tree won't override an included one
    if the #include statement is at the end of the file.
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at bootlin.com>


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

4e2aa51c8142f4c99363e229b199be5893bb88e2
 slides/kernel-hw-devices/kernel-hw-devices.tex | 5 +++--
 slides/sysdev-hw-devices/sysdev-hw-devices.tex | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/slides/kernel-hw-devices/kernel-hw-devices.tex b/slides/kernel-hw-devices/kernel-hw-devices.tex
index 29ae896d..476d67c2 100644
--- a/slides/kernel-hw-devices/kernel-hw-devices.tex
+++ b/slides/kernel-hw-devices/kernel-hw-devices.tex
@@ -367,9 +367,10 @@ $ dtc -I dtb -O dts foo.dtb
     \end{itemize}
   \item The \code{.dts} file contains the board-level information
   \item The inclusion works by {\bf overlaying} the tree of the
-    including file over the tree of the included file.
+    including file over the tree of the included file, according
+    to the order of the \code{#include} directives.
   \item Allows an including file to {\bf override} values specified by
-    an included file
+    an included file.
   \item Uses the C pre-processor {\tt \#include} directive
   \end{itemize}
 \end{frame}
diff --git a/slides/sysdev-hw-devices/sysdev-hw-devices.tex b/slides/sysdev-hw-devices/sysdev-hw-devices.tex
index 9c7468cf..512deb06 100644
--- a/slides/sysdev-hw-devices/sysdev-hw-devices.tex
+++ b/slides/sysdev-hw-devices/sysdev-hw-devices.tex
@@ -1119,7 +1119,8 @@ $ dtc -I dtb -O dts foo.dtb
     \end{itemize}
   \item The \code{.dts} file contains the board-level information
   \item The inclusion works by {\bf overlaying} the tree of the
-    including file over the tree of the included file.
+    including file over the tree of the included file,
+    according to the order of the \code{#include} directives. 
   \item Allows an including file to {\bf override} values specified by
     an included file
   \item Uses the C pre-processor \code{#include} directive




More information about the training-materials-updates mailing list