[bootlin/training-materials updates] master: labs/buildroot, lab-data/buildroot: update to Buildroot 2020.02 (fe252c43)

Thomas Petazzoni thomas.petazzoni at bootlin.com
Fri Apr 3 11:41:48 CEST 2020 

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

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

commit fe252c43e64ba12a476cbcc8c6cf058c0552b3a7
Author: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Date:   Fri Apr 3 11:41:48 2020 +0200

    labs/buildroot, lab-data/buildroot: update to Buildroot 2020.02
    
    This commit updates the Buildroot labs to Buildroot 2020.02, Linux
    5.4.30 and U-Boot 2020.01.
    
    Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>


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

fe252c43e64ba12a476cbcc8c6cf058c0552b3a7
 .../linux/0001-Add-nunchuk-driver.patch            | 16 ++++-----
 .../0002-Add-i2c1-and-nunchuk-nodes-in-dts.patch   | 14 ++++----
 labs/buildroot-basic/buildroot-basic.tex           | 40 +++++++++++-----------
 labs/buildroot-rootfs/buildroot-rootfs.tex         |  2 +-
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/lab-data/buildroot/buildroot-rootfs/linux/0001-Add-nunchuk-driver.patch b/lab-data/buildroot/buildroot-rootfs/linux/0001-Add-nunchuk-driver.patch
index e7b21775..88d54be3 100644
--- a/lab-data/buildroot/buildroot-rootfs/linux/0001-Add-nunchuk-driver.patch
+++ b/lab-data/buildroot/buildroot-rootfs/linux/0001-Add-nunchuk-driver.patch
@@ -1,4 +1,4 @@
-From 3ccd02991ef89b40b2b445ba6c91c753619644c4 Mon Sep 17 00:00:00 2001
+From 2e5025ebffc3c4d3bb697695409bb97b9fa8362b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Antoine=20T=C3=A9nart?= <antoine.tenart at bootlin.com>
 Date: Mon, 7 Apr 2014 11:55:31 +0200
 Subject: [PATCH 1/2] Add nunchuk driver
@@ -16,10 +16,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
  create mode 100644 drivers/input/joystick/wiichuck.c
 
 diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
-index d8f9c6e1fc08..ca5fd65e3561 100644
+index 312b854b5506..95dfbe49de75 100644
 --- a/drivers/input/joystick/Kconfig
 +++ b/drivers/input/joystick/Kconfig
-@@ -193,6 +193,19 @@ config JOYSTICK_TWIDJOY
+@@ -194,6 +194,19 @@ config JOYSTICK_TWIDJOY
  	  To compile this driver as a module, choose M here: the
  	  module will be called twidjoy.
  
@@ -40,17 +40,17 @@ index d8f9c6e1fc08..ca5fd65e3561 100644
  	tristate "5-byte Zhenhua RC transmitter"
  	select SERIO
 diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile
-index dd0492ebbed7..7ecc74f6aa8b 100644
+index 8656023f6ef5..75483596c895 100644
 --- a/drivers/input/joystick/Makefile
 +++ b/drivers/input/joystick/Makefile
-@@ -32,6 +32,7 @@ obj-$(CONFIG_JOYSTICK_TMDC)		+= tmdc.o
- obj-$(CONFIG_JOYSTICK_TURBOGRAFX)	+= turbografx.o
+@@ -34,6 +34,7 @@ obj-$(CONFIG_JOYSTICK_TURBOGRAFX)	+= turbografx.o
  obj-$(CONFIG_JOYSTICK_TWIDJOY)		+= twidjoy.o
  obj-$(CONFIG_JOYSTICK_WARRIOR)		+= warrior.o
+ obj-$(CONFIG_JOYSTICK_WALKERA0701)	+= walkera0701.o
 +obj-$(CONFIG_JOYSTICK_WIICHUCK)		+= wiichuck.o
  obj-$(CONFIG_JOYSTICK_XPAD)		+= xpad.o
  obj-$(CONFIG_JOYSTICK_ZHENHUA)		+= zhenhua.o
- obj-$(CONFIG_JOYSTICK_WALKERA0701)	+= walkera0701.o
+ 
 diff --git a/drivers/input/joystick/wiichuck.c b/drivers/input/joystick/wiichuck.c
 new file mode 100644
 index 000000000000..939cf0c27100
@@ -481,5 +481,5 @@ index 000000000000..939cf0c27100
 +}
 +module_exit(wiichuck_exit);
 -- 
-2.20.1
+2.25.1
 
diff --git a/lab-data/buildroot/buildroot-rootfs/linux/0002-Add-i2c1-and-nunchuk-nodes-in-dts.patch b/lab-data/buildroot/buildroot-rootfs/linux/0002-Add-i2c1-and-nunchuk-nodes-in-dts.patch
index c6c13c80..9235d1ae 100644
--- a/lab-data/buildroot/buildroot-rootfs/linux/0002-Add-i2c1-and-nunchuk-nodes-in-dts.patch
+++ b/lab-data/buildroot/buildroot-rootfs/linux/0002-Add-i2c1-and-nunchuk-nodes-in-dts.patch
@@ -1,4 +1,4 @@
-From 785f41a961a02659656e50c5b9020776d5499b00 Mon Sep 17 00:00:00 2001
+From 95671fdbbed8f9c7cd28bcb107c71d899d9e0fd9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Antoine=20T=C3=A9nart?= <antoine.tenart at bootlin.com>
 Date: Mon, 7 Apr 2014 11:55:56 +0200
 Subject: [PATCH 2/2] Add i2c1 and nunchuk nodes in dts
@@ -14,10 +14,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
  2 files changed, 20 insertions(+)
 
 diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 73b514dddf65..8a3c6927f4b0 100644
+index 89b4cf2cb7f8..c7ea2dd45f26 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -92,6 +92,13 @@
+@@ -89,6 +89,13 @@
  		>;
  	};
  
@@ -30,12 +30,12 @@ index 73b514dddf65..8a3c6927f4b0 100644
 +
  	uart0_pins: pinmux_uart0_pins {
  		pinctrl-single,pins = <
- 			AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
+ 			AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
 diff --git a/arch/arm/boot/dts/am335x-boneblack-common.dtsi b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
-index 325daae40278..e13979dc555e 100644
+index 91f93bc89716..fb48d82b535e 100644
 --- a/arch/arm/boot/dts/am335x-boneblack-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
-@@ -161,3 +161,16 @@
+@@ -166,3 +166,16 @@
  		};
  	};
  };
@@ -53,5 +53,5 @@ index 325daae40278..e13979dc555e 100644
 +	 };
 +};
 -- 
-2.20.1
+2.25.1
 
diff --git a/labs/buildroot-basic/buildroot-basic.tex b/labs/buildroot-basic/buildroot-basic.tex
index a8a1a9e3..a827c32f 100644
--- a/labs/buildroot-basic/buildroot-basic.tex
+++ b/labs/buildroot-basic/buildroot-basic.tex
@@ -42,18 +42,18 @@ git clone https://git.buildroot.net/git/buildroot.git
 \end{verbatim}
 
 In the worst case, if neither work, you can download the Buildroot
-tarball \code{buildroot-2019.02.tar.bz2} from
+tarball \code{buildroot-2020.02.tar.bz2} from
 \code{https://buildroot.org/downloads/} and extract it. However in this
 case, you won't be able to use {\em Git} to visualize your changes and
 keep track of them.
 
 Go into the newly created \code{buildroot} directory.
 
-We're going to start a branch from the {\em 2019.02} Buildroot
+We're going to start a branch from the {\em 2020.02} Buildroot
 release, with which this training has been tested.
 
 \begin{verbatim}
-git checkout -b felabs 2019.02
+git checkout -b felabs 2020.02
 \end{verbatim}
 
 \section{Configuring Buildroot}
@@ -116,13 +116,13 @@ Now, let's do the configuration:
 
   \item By default, Buildroot builds its own toolchain. This takes
     quite a bit of time, and for \code{ARMv7} platforms, there is a
-    pre-built toolchain provided by Linaro. We'll use it through the
+    pre-built toolchain provided by ARM. We'll use it through the
     {\em external toolchain} mechanism of Buildroot. Select
     \code{External toolchain} as the \code{Toolchain type}. Do not
     hesitate however to look at the available options when you select
     \code{Buildroot toolchain} as the \code{Toolchain type}.
 
-  \item Select \code{Arm ARM 2018.11} as the
+  \item Select \code{Arm ARM 2019.12} as the
     \code{Toolchain}. Buildroot can either use pre-defined toolchains
     such as the ones provided by ARM, or custom toolchains (either
     downloaded from a given location, or pre-installed on your
@@ -151,8 +151,8 @@ Now, let's do the configuration:
 
   \item By default, the most recent Linux kernel version available at
     the time of the Buildroot release is used. In our case, we want to
-    use a specific version: \code{4.19.29}. So select \code{Custom
-      version} as the \code{Kernel version}, and enter \code{4.19.29} in
+    use a specific version: \code{5.4.30}. So select \code{Custom
+      version} as the \code{Kernel version}, and enter \code{5.4.30} in
     the \code{Kernel version} text field that appears.
 
   \item Now, we need to define which kernel configuration to
@@ -160,7 +160,7 @@ Now, let's do the configuration:
     the kernel sources themselves, called a {\em defconfig}. To
     identify which {\em defconfig} to use, you can look in the kernel
     sources directly, at
-    \url{https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/configs/?id=v4.19}. In
+    \url{https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/configs/?id=v5.4}. In
     practice, for this platform, it is not trivial to find which one
     to use: the AM335x processor is supported in the Linux kernel as
     part of the support for many other Texas Instruments processors:
@@ -180,19 +180,17 @@ Now, let's do the configuration:
 
   \item On ARM, all modern platforms now use the {\em Device Tree} to
     describe the hardware. The BeagleBone Black Wireless is in this
-    situation, so you'll have to enable the
-    \code{Build a Device Tree Blob} option. At
-    \url{https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/?id=v4.19},
+    situation, so you'll have to enable the \code{Build a Device Tree
+      Blob} option. At
+    \url{https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/?id=v5.4},
     you can see the list of all Device Tree files available in the
     4.19 Linux kernel (note: the Device Tree files for boards use the
     \code{.dts} extension). The one for the BeagleBone Black Wireless
     is \code{am335x-boneblack-wireless.dts}. Even if talking about
     Device Tree is beyond the scope of this training, feel free to
     have a look at this file to see what it contains. Back in
-    Buildroot, use the option
-    \code{Use a device tree present in the kernel}, and type
-    \code{am335x-boneblack-wireless} as the \code{Device Tree Source
-      file names}.
+    Buildroot, type \code{am335x-boneblack-wireless} as the
+    \code{In-tree Device Tree Source file names}.
 
   \item The kernel configuration for this platform requires having
     OpenSSL available on the host machine. To avoid depending on the
@@ -227,14 +225,16 @@ Now, let's do the configuration:
     recent enough U-Boot version, we are going to use the latter,
     called {\em Kconfig}.
 
-  \item Use the custom version of U-Boot \code{2019.01}.
+  \item Use the custom version of U-Boot \code{2020.01}.
 
   \item Look at
     \url{http://git.denx.de/?p=u-boot.git;a=tree;f=configs} to
-    identify the available U-Boot configuration. The one matching the
-    BeagleBone Black (including Wireless) is
-    \code{am335x_boneblack_defconfig}, so type \code{am335x_boneblack}
-    in \code{Board defconfig}.
+    identify the available U-Boot configuration. For many AM335x
+    platforms, U-Boot has a single configuration called
+    \code{am335x_evm_defconfig}, which can then be given the exact
+    hardware platform to support using a Device Tree. So we need to
+    use \code{am335x_evm} as \code{Board defconfig} and
+    \code{DEVICE_TREE=am335x-boneblack} as \code{Custom make options}
 
   \item U-Boot on AM335x is split in two parts: the first stage
     bootloader called \code{MLO} and the second stage bootloader
diff --git a/labs/buildroot-rootfs/buildroot-rootfs.tex b/labs/buildroot-rootfs/buildroot-rootfs.tex
index bebb398b..9d605b20 100644
--- a/labs/buildroot-rootfs/buildroot-rootfs.tex
+++ b/labs/buildroot-rootfs/buildroot-rootfs.tex
@@ -230,7 +230,7 @@ do a build:
 make linux-dirclean
 \end{verbatim}
 
-If you check in \code{output/build/}, the \code{linux-4.19.29}
+If you check in \code{output/build/}, the \code{linux-5.4.30}
 directory will have disappeared.
 
 Now, we need to adjust our kernel configuration to enable the {\em Wii

More information about the training-materials-updates mailing list