[bootlin/training-materials updates] master: yocto: Update lab-data and the pin numbers (b7b98de0)

[Maxime Chevallier]

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

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

commit b7b98de0293961fdbd2880dc101b773f5a1e1a81
Author: Maxime Chevallier <maxime.chevallier at bootlin.com>
Date:   Mon Sep 23 16:29:33 2019 +0200

    yocto: Update lab-data and the pin numbers
    
    Signed-off-by: Maxime Chevallier <maxime.chevallier at bootlin.com>


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

b7b98de0293961fdbd2880dc101b773f5a1e1a81
 .../0001-u-boot-update-config.patch                | 41 +++++++++++++++-------
 labs/yocto-extend-recipe/yocto-extend-recipe.tex   |  4 +--
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/lab-data/yocto-stm32/bootlin-lab-data/0001-u-boot-update-config.patch b/lab-data/yocto-stm32/bootlin-lab-data/0001-u-boot-update-config.patch
index e7085d81..b9cf0a3c 100644
--- a/lab-data/yocto-stm32/bootlin-lab-data/0001-u-boot-update-config.patch
+++ b/lab-data/yocto-stm32/bootlin-lab-data/0001-u-boot-update-config.patch
@@ -1,17 +1,17 @@
-From b0f4f8dce21cc1a019ac7f65b5afc2895e455c61 Mon Sep 17 00:00:00 2001
+From 336ad1e345fdfd381ec1e3503326993b6e8581d1 Mon Sep 17 00:00:00 2001
 From: Alexandre Belloni <alexandre.belloni at bootlin.com>
 Date: Sun, 28 Apr 2019 23:28:16 +0200
 Subject: [PATCH] u-boot: update config
 
 Signed-off-by: Alexandre Belloni <alexandre.belloni at bootlin.com>
 ---
- recipes-bsp/u-boot/u-boot-stm32mp-common_2018.11.inc |  1 +
- .../0009-ARM-v2018.11-stm32mp-r1-CONFIG.patch        | 20 ++++++++++++++++++++
- 2 files changed, 21 insertions(+)
+ .../u-boot/u-boot-stm32mp-common_2018.11.inc  |  1 +
+ .../0009-ARM-v2018.11-stm32mp-r1-CONFIG.patch | 35 +++++++++++++++++++
+ 2 files changed, 36 insertions(+)
  create mode 100644 recipes-bsp/u-boot/u-boot-stm32mp/0009-ARM-v2018.11-stm32mp-r1-CONFIG.patch
 
 diff --git a/recipes-bsp/u-boot/u-boot-stm32mp-common_2018.11.inc b/recipes-bsp/u-boot/u-boot-stm32mp-common_2018.11.inc
-index ab0627ade51a..ee602a7bb29e 100644
+index ab0627a..ee602a7 100644
 --- a/recipes-bsp/u-boot/u-boot-stm32mp-common_2018.11.inc
 +++ b/recipes-bsp/u-boot/u-boot-stm32mp-common_2018.11.inc
 @@ -24,6 +24,7 @@ SRC_URI += " \
@@ -24,15 +24,27 @@ index ab0627ade51a..ee602a7bb29e 100644
  U_BOOT_VERSION = "2018.11"
 diff --git a/recipes-bsp/u-boot/u-boot-stm32mp/0009-ARM-v2018.11-stm32mp-r1-CONFIG.patch b/recipes-bsp/u-boot/u-boot-stm32mp/0009-ARM-v2018.11-stm32mp-r1-CONFIG.patch
 new file mode 100644
-index 000000000000..06c3c5d8482f
+index 0000000..f96e03a
 --- /dev/null
 +++ b/recipes-bsp/u-boot/u-boot-stm32mp/0009-ARM-v2018.11-stm32mp-r1-CONFIG.patch
-@@ -0,0 +1,20 @@
-+--- a/configs/stm32mp15_trusted_defconfig 2019-04-25 22:22:23.924734348 +0000
-++++ b/configs/stm32mp15_trusted_defconfig 2019-04-28 20:54:48.492275186 +0000
-+@@ -34,6 +34,10 @@ CONFIG_CMD_EXT4_WRITE=y
-+ CONFIG_CMD_MTDPARTS=y
+@@ -0,0 +1,35 @@
++From 5f35267b79c5a9a74b45514fba91e459b6264ebc Mon Sep 17 00:00:00 2001
++From: Maxime Chevallier <maxime.chevallier at bootlin.com>
++Date: Mon, 23 Sep 2019 16:23:54 +0200
++Subject: [PATCH] ARM-v2018.11-stm32mp-r1-CONFIG
++
++Signed-off-by: Maxime Chevallier <maxime.chevallier at bootlin.com>
++---
++ configs/stm32mp15_basic_defconfig | 5 ++++-
++ 1 file changed, 4 insertions(+), 1 deletion(-)
++
++diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
++index d04e1d74fc..402c255613 100644
++--- a/configs/stm32mp15_basic_defconfig
+++++ b/configs/stm32mp15_basic_defconfig
++@@ -45,6 +45,10 @@ CONFIG_CMD_MTDPARTS=y
 + CONFIG_CMD_UBI=y
++ # CONFIG_SPL_DOS_PARTITION is not set
 + CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
 ++CONFIG_ENV_IS_IN_EXT4=y
 ++CONFIG_ENV_EXT4_INTERFACE="mmc"
@@ -41,13 +53,16 @@ index 000000000000..06c3c5d8482f
 + CONFIG_STM32_ADC=y
 + CONFIG_USB_FUNCTION_FASTBOOT=y
 + CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
-+@@ -99,6 +103,5 @@ CONFIG_VIDEO_STM32=y
++@@ -112,6 +116,5 @@ CONFIG_VIDEO_STM32=y
 + CONFIG_VIDEO_STM32_DSI=y
 + CONFIG_VIDEO_STM32_MAX_XRES=1280
 + CONFIG_VIDEO_STM32_MAX_YRES=800
 +-CONFIG_STM32MP_WATCHDOG=y
 + CONFIG_FDT_FIXUP_PARTITIONS=y
 + # CONFIG_EFI_LOADER is not set
++-- 
++2.20.1
++
 -- 
-2.7.4
+2.20.1
 
diff --git a/labs/yocto-extend-recipe/yocto-extend-recipe.tex b/labs/yocto-extend-recipe/yocto-extend-recipe.tex
index a415943f..e9ffe9c1 100644
--- a/labs/yocto-extend-recipe/yocto-extend-recipe.tex
+++ b/labs/yocto-extend-recipe/yocto-extend-recipe.tex
@@ -88,8 +88,8 @@ Identify the 4 pins of the Nunchuk connector:
 \ifdefstring{\labboard}{discovery}{
 Connect the Nunchuk pins:
 \begin{itemize}
-\item The \code{GND} pin to CN16 pin 7 (\code{GND})
-\item The \code{PWR} pin to CN16 pin 8 (\code{3V3})
+\item The \code{GND} pin to CN16 pin 6 (\code{GND})
+\item The \code{PWR} pin to CN16 pin 4 (\code{3V3})
 \item The \code{DATA} pin to CN13 pin 9 (\code{D14})
 \item The \code{CLK} pin to CN13 pin 10 (\code{D15})
 \end{itemize}