[bootlin/training-materials updates] master: labs/kernel: Use a bbb-custom branch an remain on it to avoid writing the same DT twice (8b531bc4)

Miquel Raynal miquel.raynal at bootlin.com
Fri Mar 24 18:46:37 CET 2023

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


commit 8b531bc4b7597f2ee1c8f0be2af9595492b33af2
Author: Miquel Raynal <miquel.raynal at bootlin.com>
Date:   Tue Mar 21 12:21:38 2023 +0100

    labs/kernel: Use a bbb-custom branch an remain on it to avoid writing the same DT twice
    Signed-off-by: Miquel Raynal <miquel.raynal at bootlin.com>


 labs/kernel-i2c-communication/kernel-i2c-communication.tex  |  2 +-
 .../kernel-i2c-describing-hardware.tex                      |  4 ++--
 labs/kernel-i2c-multiplexing/kernel-i2c-multiplexing.tex    |  2 +-
 labs/kernel-serial-iomem/kernel-serial-iomem.tex            | 13 +++----------
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/labs/kernel-i2c-communication/kernel-i2c-communication.tex b/labs/kernel-i2c-communication/kernel-i2c-communication.tex
index edeaec45..226db183 100644
--- a/labs/kernel-i2c-communication/kernel-i2c-communication.tex
+++ b/labs/kernel-i2c-communication/kernel-i2c-communication.tex
@@ -15,7 +15,7 @@ After this lab, you will be able to:
 Stay in the \code{~/linux-kernel-labs/src/linux} directory for kernel and DTB
-compiling (stay in the \code{nunchuk} branch).
+compiling (stay in the \code{bbb-custom} branch).
 In a new terminal, go to
 \code{~/linux-kernel-labs/modules/nfsroot/root/nunchuk/}.  This directory
diff --git a/labs/kernel-i2c-describing-hardware/kernel-i2c-describing-hardware.tex b/labs/kernel-i2c-describing-hardware/kernel-i2c-describing-hardware.tex
index d827cefe..009ca93f 100644
--- a/labs/kernel-i2c-describing-hardware/kernel-i2c-describing-hardware.tex
+++ b/labs/kernel-i2c-describing-hardware/kernel-i2c-describing-hardware.tex
@@ -13,8 +13,8 @@ to our BBB.
 Go to the \code{~/linux-kernel-labs/src/linux} directory. Check out the
 \code{5.10.bootlin} branch.
-Now create a new \code{nunchuk} branch starting from this branch,
-for your upcoming work on the Nunchuk driver.
+Now create a new \code{bbb-custom} branch starting from this branch,
+for your upcoming Device Tree changes on the Beagle Bone Black.
 Download a useful document sharing useful details about the Nunchuk
 and its connector:\\
diff --git a/labs/kernel-i2c-multiplexing/kernel-i2c-multiplexing.tex b/labs/kernel-i2c-multiplexing/kernel-i2c-multiplexing.tex
index b3509ed5..91cfeda3 100644
--- a/labs/kernel-i2c-multiplexing/kernel-i2c-multiplexing.tex
+++ b/labs/kernel-i2c-multiplexing/kernel-i2c-multiplexing.tex
@@ -10,7 +10,7 @@ pinctrl settings.
-Continue using the \code{nunchuk} branch in the
+Continue using the \code{bbb-custom} branch in the
 \code{~/linux-kernel-labs/src/linux} directory.
 \section{Probing the different busses}
diff --git a/labs/kernel-serial-iomem/kernel-serial-iomem.tex b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
index 0b7f2ddd..c836dbb0 100644
--- a/labs/kernel-serial-iomem/kernel-serial-iomem.tex
+++ b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
@@ -15,16 +15,9 @@ After this lab, you will be able to:
-Go to your kernel source directory.
-Create a new branch for this new series of labs. Since this new stuff
-is independent from the nunchuk changes, it's best to create a separate
-git checkout 5.10.bootlin
-git checkout -b uart
+Go to your kernel source directory and continue working with the
+\code{bbb-custom} branch, this way we can keep the same custom Device
+Tree we already created, and build on top of it.
 \section{Add UART devices}

More information about the training-materials-updates mailing list