[bootlin/training-materials updates] master: yocto-stm32: remove unnecessary out of tree patch (1244cd21)

Alexandre Belloni alexandre.belloni at bootlin.com
Wed Jun 10 11:16:18 CEST 2020


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

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

commit 1244cd217b5f6c32856025939e924f6abb17412a
Author: Alexandre Belloni <alexandre.belloni at bootlin.com>
Date:   Wed Jun 10 11:16:18 2020 +0200

    yocto-stm32: remove unnecessary out of tree patch
    
    ST is now properly configuring the u-boot environment since 8efdfc6932fe
    ("U-BOOT-STM32MP: v1.1.0 update")
    
    Signed-off-by: Alexandre Belloni <alexandre.belloni at bootlin.com>


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

1244cd217b5f6c32856025939e924f6abb17412a
 .../0001-u-boot-update-config.patch                | 68 ----------------------
 .../yocto-first-build-stm32.tex                    |  2 -
 2 files changed, 70 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
deleted file mode 100644
index b9cf0a3c..00000000
--- a/lab-data/yocto-stm32/bootlin-lab-data/0001-u-boot-update-config.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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>
----
- .../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 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 += " \
-     file://0006-ARM-v2018.11-stm32mp-r2-MACHINE.patch \
-     file://0007-ARM-v2018.11-stm32mp-r2-DEVICETREE.patch \
-     file://0008-ARM-v2018.11-stm32mp-r2-MISC.patch \
-+    file://0009-ARM-v2018.11-stm32mp-r1-CONFIG.patch \
-     "
- 
- 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 0000000..f96e03a
---- /dev/null
-+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0009-ARM-v2018.11-stm32mp-r1-CONFIG.patch
-@@ -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"
-++CONFIG_ENV_EXT4_DEVICE_AND_PART="0:4"
-++CONFIG_ENV_EXT4_FILE="/uboot.env"
-+ CONFIG_STM32_ADC=y
-+ CONFIG_USB_FUNCTION_FASTBOOT=y
-+ CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
-+@@ -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.20.1
-
diff --git a/labs/yocto-first-build-stm32/yocto-first-build-stm32.tex b/labs/yocto-first-build-stm32/yocto-first-build-stm32.tex
index 584e14af..50a38d14 100644
--- a/labs/yocto-first-build-stm32/yocto-first-build-stm32.tex
+++ b/labs/yocto-first-build-stm32/yocto-first-build-stm32.tex
@@ -35,8 +35,6 @@ and download the OpenEmbedded and STM32MP layers:
 \begin{verbatim}
 git clone -b zeus git://git.openembedded.org/meta-openembedded
 git clone -b zeus https://github.com/STMicroelectronics/meta-st-stm32mp.git
-cd meta-st-stm32mp/
-git am $HOME/__SESSION_NAME__-labs/bootlin-lab-data/0001-u-boot-update-config.patch
 \end{verbatim}
 
 \section{Set up the build environment}




More information about the training-materials-updates mailing list