U-BOOT-STM32MP: update to v2.0.0 (v2020.01-stm32mp-r1)

Change-Id: I5908d17b94ecebb39dfa2c9079dd8ecbe404a124
2020-06-17 16:47:46 +02:00 · 2020-06-17 16:47:46 +02:00 · 0e9e053da9
parent 730fb4e12c
commit 0e9e053da9
28 changed files with 30790 additions and 51119 deletions
--- a/recipes-bsp/u-boot/u-boot-stm32mp-archiver.inc
+++ b/recipes-bsp/u-boot/u-boot-stm32mp-archiver.inc
@ -43,8 +43,6 @@ archiver_create_makefile_for_sdk() {

    echo "LOCAL_PATH=\$(PWD)" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    echo "" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
-    echo -n "EXTRA_OEMAKE=" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
-    echo "${EXTRA_OEMAKE}" | sed "s|HOSTCC=${BUILD_CC}||" | sed "s|STAGING_INCDIR=${STAGING_INCDIR_NATIVE}||" | sed "s|STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}||" | sed "s|${BUILD_CFLAGS} ||" | sed "s|${BUILD_LDFLAGS}||" |sed "s|CC=\([^ ]*\) --sysroot=[^ ]* |CC=\"\1 \$(KCFLAGS)\" |" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    echo "" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    echo "UBOOT_LOCALVERSION=${UBOOT_LOCALVERSION}" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    echo "" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
@ -93,11 +91,11 @@ archiver_create_makefile_for_sdk() {
    echo "		if [ ! -d \$(LOCAL_PATH)/../build\$\$uboot_type ]; then \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    echo "			mkdir -p \$(LOCAL_PATH)/../build\$\$uboot_type ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    echo "			echo \$(UBOOT_LOCALVERSION) > \$(LOCAL_PATH)/../build\$\$uboot_type/.scmversion ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
-    echo "			\$(MAKE) \$(EXTRA_OEMAKE) -C \$(LOCAL_PATH) O=\$(LOCAL_PATH)/../build\$\$uboot_type \$\$uboot_config ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
+    echo "			\$(MAKE) -C \$(LOCAL_PATH) O=\$(LOCAL_PATH)/../build\$\$uboot_type \$\$uboot_config ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    echo "		fi ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    # Build binaries
    echo "		if [ -z \"\$(DEVICE_TREE)\" ]; then \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
-    echo "			\$(MAKE) \$(EXTRA_OEMAKE) -C \$(LOCAL_PATH) O=\$(LOCAL_PATH)/../build\$\$uboot_type ${UBOOT_MAKE_TARGET} ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
+    echo "			\$(MAKE) -C \$(LOCAL_PATH) O=\$(LOCAL_PATH)/../build\$\$uboot_type ${UBOOT_MAKE_TARGET} ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    # Copy binary files with explicit name
    echo "			cp -f \$(LOCAL_PATH)/../build\$\$uboot_type/\$\$uboot_binary \$(LOCAL_PATH)/../build\$\$uboot_type/u-boot\$\$uboot_type.\$\$uboot_suffix ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    echo "			cp -f \$(LOCAL_PATH)/../build\$\$uboot_type/${UBOOT_ELF} \$(LOCAL_PATH)/../build\$\$uboot_type/u-boot\$\$uboot_type.${UBOOT_ELF_SUFFIX} ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
@ -107,7 +105,7 @@ archiver_create_makefile_for_sdk() {
    echo "			fi ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    echo "		else \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    echo "			for devicetree in \$(DEVICE_TREE); do \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
-    echo "				\$(MAKE) \$(EXTRA_OEMAKE) -C \$(LOCAL_PATH) O=\$(LOCAL_PATH)/../build\$\$uboot_type ${UBOOT_MAKE_TARGET} DEVICE_TREE=\$\$devicetree ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
+    echo "				\$(MAKE) -C \$(LOCAL_PATH) O=\$(LOCAL_PATH)/../build\$\$uboot_type ${UBOOT_MAKE_TARGET} DEVICE_TREE=\$\$devicetree DEVICE_TREE_EXT=\$\$devicetree.dtb; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    # Copy binary files with explicit name
    echo "				cp -f \$(LOCAL_PATH)/../build\$\$uboot_type/\$\$uboot_binary \$(LOCAL_PATH)/../build\$\$uboot_type/u-boot-\$\$devicetree\$\$uboot_type.\$\$uboot_suffix ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
    echo "				cp -f \$(LOCAL_PATH)/../build\$\$uboot_type/${UBOOT_ELF} \$(LOCAL_PATH)/../build\$\$uboot_type/u-boot-\$\$devicetree\$\$uboot_type.${UBOOT_ELF_SUFFIX} ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
--- a/recipes-bsp/u-boot/u-boot-stm32mp-common_2018.11.inc
+++ b/recipes-bsp/u-boot/u-boot-stm32mp-common_2018.11.inc
@ -1,58 +0,0 @@
-# Adaptation from u-boot-common_${PV}.inc
-
-HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
-SECTION = "bootloaders"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
-
-DEPENDS += "dtc-native bc-native"
-DEPENDS += "flex-native bison-native"
-
-COMPATIBLE_MACHINE = "(stm32mpcommon)"
-
-SRC_URI = "https://github.com/u-boot/u-boot/archive/v${PV}.tar.gz"
-SRC_URI[md5sum] = "7ee14909d5d4d701fd3a6b12aad4d762"
-SRC_URI[sha256sum] = "33b5cf99bac91d678ed6708be7b7cbbed36c45eb071e6228f83c25ad3a1de13a"
-
-SRC_URI += " \
-    file://0001-ARM-v2018.11-stm32mp-r1-MACHINE.patch \
-    file://0002-ARM-v2018.11-stm32mp-r1-BOARD.patch \
-    file://0003-ARM-v2018.11-stm32mp-r1-DEVICETREE.patch \
-    file://0004-ARM-v2018.11-stm32mp-r1-CONFIG.patch \
-    file://0005-ARM-v2018.11-stm32mp-r1-MISC.patch \
-    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-r3-MACHINE.patch \
-    file://0010-ARM-v2018.11-stm32mp-r3-BOARD.patch \
-    file://0011-ARM-v2018.11-stm32mp-r3-DEVICETREE.patch \
-    file://0012-ARM-v2018.11-stm32mp-r3-CONFIG.patch \
-    file://0013-ARM-v2018.11-stm32mp-r3-MISC.patch \
-    file://0014-ARM-v2018.11-stm32mp-r4-MACHINE.patch \
-    file://0015-ARM-v2018.11-stm32mp-r4-BOARD.patch \
-    file://0016-ARM-v2018.11-stm32mp-r4-DEVICETREE.patch \
-    file://0017-ARM-v2018.11-stm32mp-r4-MISC.patch \
-    "
-
-U_BOOT_VERSION = "2018.11"
-PV = "${U_BOOT_VERSION}"
-
-S = "${WORKDIR}/u-boot-${PV}"
-
-# ---------------------------------
-# Configure devupstream class usage
-# ---------------------------------
-BBCLASSEXTEND = "devupstream:target"
-
-SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/u-boot.git;name=uboot;protocol=https;branch=v2018.11-stm32mp"
-SRCREV_class-devupstream = "fd915f073fe23fea3eb509dbc26ac9da1893692a"
-SRCREV_FORMAT_class-devupstream = "uboot"
-PV_class-devupstream = "${U_BOOT_VERSION}+github+${SRCPV}"
-
-# ---------------------------------
-# Configure default preference to manage dynamic selection between tarball and github
-# ---------------------------------
-STM32MP_SOURCE_SELECTION ?= "tarball"
-
-DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"
--- a/recipes-bsp/u-boot/u-boot-stm32mp-common_2020.01.inc
+++ b/recipes-bsp/u-boot/u-boot-stm32mp-common_2020.01.inc
@ -0,0 +1,47 @@
+# Adaptation from u-boot-common_${PV}.inc
+
+HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
+SECTION = "bootloaders"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
+
+DEPENDS += "dtc-native bc-native"
+DEPENDS += "flex-native bison-native"
+
+COMPATIBLE_MACHINE = "(stm32mpcommon)"
+
+SRC_URI = "git://github.com/u-boot/u-boot.git;protocol=https"
+SRCREV  = "0b0c6af38738f2c132cfd41a240889acaa031c8f"
+
+SRC_URI += "\
+    file://0001-ARM-v2020.01-stm32mp-r1-MACHINE.patch \
+    file://0002-ARM-v2020.01-stm32mp-r1-BOARD.patch \
+    file://0003-ARM-v2020.01-stm32mp-r1-MISC-DRIVERS.patch \
+    file://0004-ARM-v2020.01-stm32mp-r1-DEVICETREE.patch \
+    file://0005-ARM-v2020.01-stm32mp-r1-CONFIG.patch \
+    \
+    file://0099-Add-external-var-to-allow-build-of-new-devicetree-fi.patch \
+"
+
+U_BOOT_VERSION = "2020.01"
+PV = "${U_BOOT_VERSION}"
+
+S = "${WORKDIR}/git"
+
+# ---------------------------------
+# Configure devupstream class usage
+# ---------------------------------
+#BBCLASSEXTEND = "devupstream:target"
+
+#SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/u-boot.git;name=uboot;protocol=https;branch=v2018.11-stm32mp"
+#SRCREV_class-devupstream = "a120b9bdb3e656bb2f0485924d77d58e2281311a"
+#SRCREV_FORMAT_class-devupstream = "uboot"
+#PV_class-devupstream = "${U_BOOT_VERSION}+github+${SRCPV}"
+
+# ---------------------------------
+# Configure default preference to manage dynamic selection between tarball and github
+# ---------------------------------
+#STM32MP_SOURCE_SELECTION ?= "tarball"
+
+#DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"
--- a/recipes-bsp/u-boot/u-boot-stm32mp.inc
+++ b/recipes-bsp/u-boot/u-boot-stm32mp.inc
@ -2,11 +2,9 @@ require recipes-bsp/u-boot/u-boot.inc

 FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-stm32mp:"

-PROVIDES += "u-boot"
-RPROVIDES_${PN} += "u-boot"
-
 # Configure build dir for externalsrc class usage through devtool
 EXTERNALSRC_BUILD_pn-${PN} = "${WORKDIR}/build"
+B = "${WORKDIR}/build"

 # Define dedicated var to configure SPL binary name to override U-Boot default
 # configuration. By this way we allow to mix configuration with and without SPL
@ -74,7 +72,7 @@ do_compile_append() {
                            then
                                rm ${B}/${config}/dts/dt.dtb
                            fi
-                            oe_runmake -C ${S} O=${B}/${config} DEVICE_TREE=${devicetree}
+                            oe_runmake -C ${S} O=${B}/${config} DEVICE_TREE=${devicetree} DEVICE_TREE_EXT=${devicetree}.dtb
                            for binary in ${UBOOT_BINARIES}; do
                                binarysuffix=$(echo ${binary} | cut -d'.' -f2)
                                k=$(expr $k + 1);
@ -109,6 +107,7 @@ do_compile_append() {
 # -----------------------------------------------------------------------------
 # Append deploy to handle specific device tree binary deployement
 #
+do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}/bootloader"
 do_deploy_append() {
    if [ -n "${UBOOT_DEVICETREE}" ]; then
        # Clean deploydir from any available binary first
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0001-ARM-v2020.01-stm32mp-r1-MACHINE.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0001-ARM-v2020.01-stm32mp-r1-MACHINE.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0002-ARM-v2018.11-stm32mp-r1-BOARD.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0002-ARM-v2018.11-stm32mp-r1-BOARD.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0002-ARM-v2020.01-stm32mp-r1-BOARD.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0002-ARM-v2020.01-stm32mp-r1-BOARD.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0003-ARM-v2018.11-stm32mp-r1-DEVICETREE.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0003-ARM-v2018.11-stm32mp-r1-DEVICETREE.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0003-ARM-v2020.01-stm32mp-r1-MISC-DRIVERS.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0003-ARM-v2020.01-stm32mp-r1-MISC-DRIVERS.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0004-ARM-v2018.11-stm32mp-r1-CONFIG.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0004-ARM-v2018.11-stm32mp-r1-CONFIG.patch
@ -1,378 +0,0 @@
-From b8317d14837ab109d5063c84a8cde6c6de474970 Mon Sep 17 00:00:00 2001
-From: christophe montaud <christophe.montaud@st.com>
-Date: Fri, 4 Jan 2019 15:08:43 +0100
-Subject: [PATCH 4/5] ARM v2018.11 stm32mp r1 CONFIG
-
---
- configs/sandbox_defconfig           |   2 +
- configs/stm32mp15_basic_defconfig   |  71 ++++++++++++++++++++----
- configs/stm32mp15_optee_defconfig   | 105 ++++++++++++++++++++++++++++++++++++
- configs/stm32mp15_trusted_defconfig | 104 +++++++++++++++++++++++++++++++++++
- 4 files changed, 273 insertions(+), 9 deletions(-)
- create mode 100644 configs/stm32mp15_optee_defconfig
- create mode 100644 configs/stm32mp15_trusted_defconfig
-
-diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
-index 5a744f4..587e2aa 100644
--- a/configs/sandbox_defconfig
-+++ b/configs/sandbox_defconfig
-@@ -215,3 +215,5 @@ CONFIG_UT_TIME=y
- CONFIG_UT_DM=y
- CONFIG_UT_ENV=y
- CONFIG_UT_OVERLAY=y
-+CONFIG_DM_HWSPINLOCK=y
-+CONFIG_HWSPINLOCK_SANDBOX=y
-diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
-index 3bf7538..ad3424e 100644
--- a/configs/stm32mp15_basic_defconfig
-+++ b/configs/stm32mp15_basic_defconfig
-@@ -1,14 +1,18 @@
- CONFIG_ARM=y
- CONFIG_ARCH_STM32MP=y
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-+CONFIG_SYS_MALLOC_F_LEN=0x3000
- CONFIG_SPL_MMC_SUPPORT=y
- CONFIG_SPL=y
- CONFIG_TARGET_STM32MP1=y
-+CONFIG_SPL_SPI_FLASH_SUPPORT=y
-+CONFIG_SPL_SPI_SUPPORT=y
-+# CONFIG_ARMV7_VIRT is not set
- CONFIG_DISTRO_DEFAULTS=y
-CONFIG_NR_DRAM_BANKS=1
-+CONFIG_FIT=y
- CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
- CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3
- CONFIG_SPL_I2C_SUPPORT=y
-+CONFIG_SPL_MTD_SUPPORT=y
- CONFIG_SPL_POWER_SUPPORT=y
- CONFIG_SYS_PROMPT="STM32MP> "
- # CONFIG_CMD_BOOTD is not set
-@@ -18,48 +22,97 @@ CONFIG_SYS_PROMPT="STM32MP> "
- # CONFIG_CMD_EXPORTENV is not set
- # CONFIG_CMD_IMPORTENV is not set
- CONFIG_CMD_MEMINFO=y
-+CONFIG_CMD_MEMTEST=y
- CONFIG_CMD_ADC=y
-+CONFIG_CMD_CLK=y
-+CONFIG_CMD_DFU=y
- CONFIG_CMD_FUSE=y
- CONFIG_CMD_GPIO=y
-CONFIG_CMD_GPT=y
- CONFIG_CMD_I2C=y
- CONFIG_CMD_MMC=y
-+CONFIG_CMD_REMOTEPROC=y
-+CONFIG_CMD_SF=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_USB_MASS_STORAGE=y
-+CONFIG_CMD_BMP=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_TIME=y
-+CONFIG_CMD_TIMER=y
- CONFIG_CMD_PMIC=y
- CONFIG_CMD_REGULATOR=y
- CONFIG_CMD_EXT4_WRITE=y
-+CONFIG_CMD_MTDPARTS=y
-+CONFIG_CMD_UBI=y
- # CONFIG_SPL_DOS_PARTITION is not set
- CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
- CONFIG_STM32_ADC=y
-+CONFIG_USB_FUNCTION_FASTBOOT=y
-+CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
-+CONFIG_FASTBOOT_BUF_SIZE=0x02000000
-+CONFIG_FASTBOOT_USB_DEV=1
-+CONFIG_FASTBOOT_FLASH=y
-+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
-+CONFIG_DM_HWSPINLOCK=y
-+CONFIG_HWSPINLOCK_STM32=y
- CONFIG_DM_I2C=y
- CONFIG_SYS_I2C_STM32F7=y
- CONFIG_LED=y
- CONFIG_LED_GPIO=y
-+CONFIG_DM_MAILBOX=y
-+CONFIG_STM32_IPCC=y
- CONFIG_DM_MMC=y
- CONFIG_STM32_SDMMC2=y
-+CONFIG_MTD=y
-+CONFIG_NAND=y
-+CONFIG_NAND_STM32_FMC2=y
-+CONFIG_DM_SPI_FLASH=y
-+CONFIG_SPI_FLASH=y
-+CONFIG_SPI_FLASH_BAR=y
-+CONFIG_SPI_FLASH_MACRONIX=y
-+CONFIG_SPI_FLASH_SPANSION=y
-+CONFIG_SPI_FLASH_STMICRO=y
-+CONFIG_SPI_FLASH_WINBOND=y
-+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
-+CONFIG_SPI_FLASH_MTD=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_DWC_ETH_QOS=y
- CONFIG_PHY=y
- CONFIG_PHY_STM32_USBPHYC=y
-# CONFIG_PINCTRL_FULL is not set
-+CONFIG_PINCONF=y
- # CONFIG_SPL_PINCTRL_FULL is not set
-+CONFIG_PINCTRL_STMFX=y
- CONFIG_DM_PMIC=y
- # CONFIG_SPL_PMIC_CHILDREN is not set
-CONFIG_PMIC_STPMU1=y
-+CONFIG_PMIC_STPMIC1=y
- CONFIG_DM_REGULATOR_FIXED=y
- CONFIG_DM_REGULATOR_GPIO=y
- CONFIG_DM_REGULATOR_STM32_VREFBUF=y
-CONFIG_DM_REGULATOR_STPMU1=y
-+CONFIG_DM_REGULATOR_STPMIC1=y
-+CONFIG_STM32MP1_DDR_INTERACTIVE=y
-+CONFIG_REMOTEPROC_STM32_COPRO=y
- CONFIG_SERIAL_RX_BUFFER=y
-CONFIG_STM32_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_STM32_QSPI=y
- CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_EHCI_HCD=y
- CONFIG_USB_EHCI_GENERIC=y
-CONFIG_USB_DWC2=y
- CONFIG_USB_STORAGE=y
- CONFIG_USB_GADGET=y
- CONFIG_USB_GADGET_MANUFACTURER="STMicroelectronics"
- CONFIG_USB_GADGET_VENDOR_NUM=0x0483
- CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
- CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
-+CONFIG_DM_VIDEO=y
-+CONFIG_BACKLIGHT_GPIO=y
-+CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
-+CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
-+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
-diff --git a/configs/stm32mp15_optee_defconfig b/configs/stm32mp15_optee_defconfig
-new file mode 100644
-index 0000000..a24727c
--- /dev/null
-+++ b/configs/stm32mp15_optee_defconfig
-@@ -0,0 +1,105 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_STM32MP=y
-+CONFIG_SYS_MALLOC_F_LEN=0x3000
-+CONFIG_TARGET_STM32MP1=y
-+CONFIG_STM32MP1_OPTEE=y
-+CONFIG_DISTRO_DEFAULTS=y
-+CONFIG_FIT=y
-+CONFIG_SYS_PROMPT="STM32MP> "
-+# CONFIG_CMD_BOOTD is not set
-+# CONFIG_CMD_ELF is not set
-+# CONFIG_CMD_IMI is not set
-+# CONFIG_CMD_XIMG is not set
-+# CONFIG_CMD_EXPORTENV is not set
-+# CONFIG_CMD_IMPORTENV is not set
-+CONFIG_CMD_MEMINFO=y
-+CONFIG_CMD_MEMTEST=y
-+CONFIG_CMD_ADC=y
-+CONFIG_CMD_CLK=y
-+CONFIG_CMD_DFU=y
-+CONFIG_CMD_FUSE=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_I2C=y
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_REMOTEPROC=y
-+CONFIG_CMD_SF=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_USB_MASS_STORAGE=y
-+CONFIG_CMD_BMP=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_TIME=y
-+CONFIG_CMD_TIMER=y
-+CONFIG_CMD_PMIC=y
-+CONFIG_CMD_REGULATOR=y
-+CONFIG_CMD_EXT4_WRITE=y
-+CONFIG_CMD_MTDPARTS=y
-+CONFIG_CMD_UBI=y
-+CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
-+CONFIG_STM32_ADC=y
-+CONFIG_USB_FUNCTION_FASTBOOT=y
-+CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
-+CONFIG_FASTBOOT_BUF_SIZE=0x02000000
-+CONFIG_FASTBOOT_USB_DEV=1
-+CONFIG_FASTBOOT_FLASH=y
-+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
-+CONFIG_DM_HWSPINLOCK=y
-+CONFIG_HWSPINLOCK_STM32=y
-+CONFIG_DM_I2C=y
-+CONFIG_SYS_I2C_STM32F7=y
-+CONFIG_LED=y
-+CONFIG_LED_GPIO=y
-+CONFIG_DM_MAILBOX=y
-+CONFIG_STM32_IPCC=y
-+CONFIG_DM_MMC=y
-+CONFIG_STM32_SDMMC2=y
-+CONFIG_MTD=y
-+CONFIG_NAND=y
-+CONFIG_NAND_STM32_FMC2=y
-+CONFIG_DM_SPI_FLASH=y
-+CONFIG_SPI_FLASH=y
-+CONFIG_SPI_FLASH_BAR=y
-+CONFIG_SPI_FLASH_MACRONIX=y
-+CONFIG_SPI_FLASH_SPANSION=y
-+CONFIG_SPI_FLASH_STMICRO=y
-+CONFIG_SPI_FLASH_WINBOND=y
-+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
-+CONFIG_SPI_FLASH_MTD=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_DWC_ETH_QOS=y
-+CONFIG_PHY=y
-+CONFIG_PHY_STM32_USBPHYC=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_STMFX=y
-+CONFIG_DM_PMIC=y
-+CONFIG_PMIC_STPMIC1=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_REGULATOR_STM32_VREFBUF=y
-+CONFIG_DM_REGULATOR_STPMIC1=y
-+CONFIG_REMOTEPROC_STM32_COPRO=y
-+CONFIG_SERIAL_RX_BUFFER=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_STM32_QSPI=y
-+CONFIG_USB=y
-+CONFIG_DM_USB=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_GENERIC=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_GADGET_MANUFACTURER="STMicroelectronics"
-+CONFIG_USB_GADGET_VENDOR_NUM=0x0483
-+CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
-+CONFIG_USB_GADGET_DWC2_OTG=y
-+CONFIG_DM_VIDEO=y
-+CONFIG_BACKLIGHT_GPIO=y
-+CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
-+CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
-+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
-diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
-new file mode 100644
-index 0000000..e41506b
--- /dev/null
-+++ b/configs/stm32mp15_trusted_defconfig
-@@ -0,0 +1,104 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_STM32MP=y
-+CONFIG_SYS_MALLOC_F_LEN=0x3000
-+CONFIG_TARGET_STM32MP1=y
-+CONFIG_DISTRO_DEFAULTS=y
-+CONFIG_FIT=y
-+CONFIG_SYS_PROMPT="STM32MP> "
-+# CONFIG_CMD_BOOTD is not set
-+# CONFIG_CMD_ELF is not set
-+# CONFIG_CMD_IMI is not set
-+# CONFIG_CMD_XIMG is not set
-+# CONFIG_CMD_EXPORTENV is not set
-+# CONFIG_CMD_IMPORTENV is not set
-+CONFIG_CMD_MEMINFO=y
-+CONFIG_CMD_MEMTEST=y
-+CONFIG_CMD_ADC=y
-+CONFIG_CMD_CLK=y
-+CONFIG_CMD_DFU=y
-+CONFIG_CMD_FUSE=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_I2C=y
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_REMOTEPROC=y
-+CONFIG_CMD_SF=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_USB_MASS_STORAGE=y
-+CONFIG_CMD_BMP=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_TIME=y
-+CONFIG_CMD_TIMER=y
-+CONFIG_CMD_PMIC=y
-+CONFIG_CMD_REGULATOR=y
-+CONFIG_CMD_EXT4_WRITE=y
-+CONFIG_CMD_MTDPARTS=y
-+CONFIG_CMD_UBI=y
-+CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
-+CONFIG_STM32_ADC=y
-+CONFIG_USB_FUNCTION_FASTBOOT=y
-+CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
-+CONFIG_FASTBOOT_BUF_SIZE=0x02000000
-+CONFIG_FASTBOOT_USB_DEV=1
-+CONFIG_FASTBOOT_FLASH=y
-+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
-+CONFIG_DM_HWSPINLOCK=y
-+CONFIG_HWSPINLOCK_STM32=y
-+CONFIG_DM_I2C=y
-+CONFIG_SYS_I2C_STM32F7=y
-+CONFIG_LED=y
-+CONFIG_LED_GPIO=y
-+CONFIG_DM_MAILBOX=y
-+CONFIG_STM32_IPCC=y
-+CONFIG_DM_MMC=y
-+CONFIG_STM32_SDMMC2=y
-+CONFIG_MTD=y
-+CONFIG_NAND=y
-+CONFIG_NAND_STM32_FMC2=y
-+CONFIG_DM_SPI_FLASH=y
-+CONFIG_SPI_FLASH=y
-+CONFIG_SPI_FLASH_BAR=y
-+CONFIG_SPI_FLASH_MACRONIX=y
-+CONFIG_SPI_FLASH_SPANSION=y
-+CONFIG_SPI_FLASH_STMICRO=y
-+CONFIG_SPI_FLASH_WINBOND=y
-+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
-+CONFIG_SPI_FLASH_MTD=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_DWC_ETH_QOS=y
-+CONFIG_PHY=y
-+CONFIG_PHY_STM32_USBPHYC=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_STMFX=y
-+CONFIG_DM_PMIC=y
-+CONFIG_PMIC_STPMIC1=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_REGULATOR_STM32_VREFBUF=y
-+CONFIG_DM_REGULATOR_STPMIC1=y
-+CONFIG_REMOTEPROC_STM32_COPRO=y
-+CONFIG_SERIAL_RX_BUFFER=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_STM32_QSPI=y
-+CONFIG_USB=y
-+CONFIG_DM_USB=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_GENERIC=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_GADGET_MANUFACTURER="STMicroelectronics"
-+CONFIG_USB_GADGET_VENDOR_NUM=0x0483
-+CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
-+CONFIG_USB_GADGET_DWC2_OTG=y
-+CONFIG_DM_VIDEO=y
-+CONFIG_BACKLIGHT_GPIO=y
-+CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
-+CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
-+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.7.4
-
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0004-ARM-v2020.01-stm32mp-r1-DEVICETREE.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0004-ARM-v2020.01-stm32mp-r1-DEVICETREE.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0005-ARM-v2018.11-stm32mp-r1-MISC.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0005-ARM-v2018.11-stm32mp-r1-MISC.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0005-ARM-v2020.01-stm32mp-r1-CONFIG.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0005-ARM-v2020.01-stm32mp-r1-CONFIG.patch
@ -0,0 +1,545 @@
+From 5731d9684c509e5d8920ad4b94391fd6aa310323 Mon Sep 17 00:00:00 2001
+From: Romuald JEANNE <romuald.jeanne@st.com>
+Date: Fri, 5 Jun 2020 13:46:04 +0200
+Subject: [PATCH 5/5] ARM v2020.01-stm32mp-r1 CONFIG
+
+---
+ configs/stm32mp15_basic_defconfig       |  36 +++++---
+ configs/stm32mp15_dhcom_basic_defconfig | 141 ++++++++++++++++++++++++++++++++
+ configs/stm32mp15_optee_defconfig       | 129 -----------------------------
+ configs/stm32mp15_trusted_defconfig     |  41 +++++++---
+ 4 files changed, 194 insertions(+), 153 deletions(-)
+ create mode 100644 configs/stm32mp15_dhcom_basic_defconfig
+ delete mode 100644 configs/stm32mp15_optee_defconfig
+
+diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
+index 713a7e6..cf28217 100644
+--- a/configs/stm32mp15_basic_defconfig
+++ b/configs/stm32mp15_basic_defconfig
+@@ -2,8 +2,12 @@ CONFIG_ARM=y
+ CONFIG_ARCH_STM32MP=y
+ CONFIG_SYS_MALLOC_F_LEN=0x3000
+ CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_ENV_OFFSET=0x280000
+ CONFIG_SPL=y
+-CONFIG_TARGET_STM32MP1=y
+CONFIG_TARGET_ST_STM32MP15x=y
+CONFIG_CMD_STM32PROG=y
+CONFIG_ENV_SECT_SIZE=0x40000
+CONFIG_ENV_OFFSET_REDUND=0x2C0000
+ CONFIG_SPL_SPI_FLASH_SUPPORT=y
+ CONFIG_SPL_SPI_SUPPORT=y
+ # CONFIG_ARMV7_VIRT is not set
+@@ -19,11 +23,13 @@ CONFIG_SPL_POWER_SUPPORT=y
+ CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
+ CONFIG_SYS_PROMPT="STM32MP> "
+ # CONFIG_CMD_BOOTD is not set
+CONFIG_CMD_DTIMG=y
+ # CONFIG_CMD_ELF is not set
+ # CONFIG_CMD_IMI is not set
+ # CONFIG_CMD_XIMG is not set
+ # CONFIG_CMD_EXPORTENV is not set
+ # CONFIG_CMD_IMPORTENV is not set
+CONFIG_CMD_ERASEENV=y
+ CONFIG_CMD_MEMINFO=y
+ CONFIG_CMD_MEMTEST=y
+ CONFIG_CMD_ADC=y
+@@ -31,10 +37,8 @@ CONFIG_CMD_CLK=y
+ CONFIG_CMD_DFU=y
+ CONFIG_CMD_FUSE=y
+ CONFIG_CMD_GPIO=y
+-CONFIG_CMD_GPT=y
+ CONFIG_CMD_I2C=y
+ CONFIG_CMD_MMC=y
+-CONFIG_CMD_MTD=y
+ CONFIG_CMD_REMOTEPROC=y
+ CONFIG_CMD_SPI=y
+ CONFIG_CMD_USB=y
+@@ -52,29 +56,31 @@ CONFIG_CMD_UBI=y
+ CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
+ CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-names interrupts-extended interrupt-controller \\\#interrupt-cells interrupt-parent dmas dma-names assigned-clocks assigned-clock-rates assigned-clock-parents hwlocks"
+ CONFIG_ENV_IS_NOWHERE=y
+-CONFIG_ENV_IS_IN_EXT4=y
+CONFIG_ENV_IS_IN_MMC=y
+ CONFIG_ENV_IS_IN_SPI_FLASH=y
+ CONFIG_ENV_IS_IN_UBI=y
+ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
+-CONFIG_ENV_EXT4_INTERFACE="mmc"
+-CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
+-CONFIG_ENV_EXT4_FILE="/uboot.env"
+-CONFIG_ENV_OFFSET_REDUND=0x2C0000
+ CONFIG_ENV_UBI_PART="UBI"
+ CONFIG_ENV_UBI_VOLUME="uboot_config"
+ CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r"
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_STM32_ADC=y
+-CONFIG_DFU_MMC=y
+-CONFIG_DFU_RAM=y
+-CONFIG_DFU_MTD=y
+-CONFIG_DFU_VIRT=y
+CONFIG_SET_DFU_ALT_INFO=y
+ CONFIG_USB_FUNCTION_FASTBOOT=y
+ CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
+ CONFIG_FASTBOOT_BUF_SIZE=0x02000000
+ CONFIG_FASTBOOT_USB_DEV=1
+ CONFIG_FASTBOOT_FLASH=y
+ CONFIG_FASTBOOT_FLASH_MMC_DEV=1
+CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y
+CONFIG_FASTBOOT_MMC_BOOT1_NAME="mmc1boot0"
+CONFIG_FASTBOOT_MMC_BOOT2_NAME="mmc1boot1"
+CONFIG_FASTBOOT_MMC_USER_SUPPORT=y
+CONFIG_FASTBOOT_MMC_USER_NAME="mmc1"
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_FASTBOOT_CMD_OEM_PARTCONF=y
+CONFIG_FASTBOOT_CMD_OEM_BOOTBUS=y
+CONFIG_GPIO_HOG=y
+ CONFIG_DM_HWSPINLOCK=y
+ CONFIG_HWSPINLOCK_STM32=y
+ CONFIG_DM_I2C=y
+@@ -88,6 +94,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y
+ CONFIG_STM32_SDMMC2=y
+ CONFIG_MTD=y
+ CONFIG_DM_MTD=y
+CONFIG_SYS_MTDPARTS_RUNTIME=y
+ CONFIG_MTD_RAW_NAND=y
+ CONFIG_NAND_STM32_FMC2=y
+ CONFIG_MTD_SPI_NAND=y
+@@ -99,6 +106,7 @@ CONFIG_SPI_FLASH_WINBOND=y
+ # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+ CONFIG_SPI_FLASH_MTD=y
+ CONFIG_SPL_SPI_FLASH_MTD=y
+CONFIG_PHY_REALTEK=y
+ CONFIG_DM_ETH=y
+ CONFIG_DWC_ETH_QOS=y
+ CONFIG_PHY=y
+@@ -113,6 +121,7 @@ CONFIG_DM_REGULATOR_FIXED=y
+ CONFIG_DM_REGULATOR_GPIO=y
+ CONFIG_DM_REGULATOR_STM32_VREFBUF=y
+ CONFIG_DM_REGULATOR_STPMIC1=y
+CONFIG_STM32MP1_DDR_INTERACTIVE=y
+ CONFIG_REMOTEPROC_STM32_COPRO=y
+ CONFIG_DM_RTC=y
+ CONFIG_RTC_STM32=y
+@@ -142,4 +151,7 @@ CONFIG_VIDEO_STM32=y
+ CONFIG_VIDEO_STM32_DSI=y
+ CONFIG_VIDEO_STM32_MAX_XRES=1280
+ CONFIG_VIDEO_STM32_MAX_YRES=800
+CONFIG_WDT=y
+CONFIG_WDT_STM32MP=y
+CONFIG_ERRNO_STR=y
+ CONFIG_FDT_FIXUP_PARTITIONS=y
+diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
+new file mode 100644
+index 0000000..ed3504d
+--- /dev/null
+++ b/configs/stm32mp15_dhcom_basic_defconfig
+@@ -0,0 +1,141 @@
+CONFIG_ARM=y
+CONFIG_ARCH_STM32MP=y
+CONFIG_SYS_MALLOC_F_LEN=0x3000
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
+CONFIG_SPL=y
+CONFIG_TARGET_DH_STM32MP1_PDK2=y
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_ARMV7_VIRT is not set
+CONFIG_SPL_TEXT_BASE=0x2FFC2500
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_FIT=y
+CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3
+CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_POWER_SUPPORT=y
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
+CONFIG_SYS_PROMPT="STM32MP> "
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EXPORTENV is not set
+CONFIG_CMD_EEPROM=y
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_ADC=y
+CONFIG_CMD_CLK=y
+CONFIG_CMD_DFU=y
+CONFIG_CMD_FUSE=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_REMOTEPROC=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_TIME=y
+CONFIG_CMD_TIMER=y
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_MTDPARTS=y
+# CONFIG_SPL_DOS_PARTITION is not set
+CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcom-pdk2"
+CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-names interrupts-extended interrupt-controller \\\#interrupt-cells interrupt-parent dmas dma-names assigned-clocks assigned-clock-rates assigned-clock-parents hwlocks"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_BUS=y
+CONFIG_ENV_SPI_BUS=0
+CONFIG_USE_ENV_SPI_CS=y
+CONFIG_ENV_SPI_CS=0
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=10000000
+CONFIG_USE_ENV_SPI_MODE=y
+CONFIG_ENV_SPI_MODE=0x0
+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=1536
+CONFIG_STM32_ADC=y
+CONFIG_SPL_BLOCK_CACHE=y
+CONFIG_DFU_MMC=y
+CONFIG_DFU_RAM=y
+CONFIG_DFU_VIRT=y
+CONFIG_SET_DFU_ALT_INFO=y
+CONFIG_GPIO_HOG=y
+CONFIG_DM_HWSPINLOCK=y
+CONFIG_HWSPINLOCK_STM32=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_STM32F7=y
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_DM_MAILBOX=y
+CONFIG_STM32_IPCC=y
+CONFIG_I2C_EEPROM=y
+CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_STM32_SDMMC2=y
+CONFIG_MTD=y
+CONFIG_SYS_MTDPARTS_RUNTIME=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_SPL_SPI_FLASH_MTD=y
+CONFIG_DM_ETH=y
+CONFIG_DWC_ETH_QOS=y
+CONFIG_PHY=y
+CONFIG_PHY_STM32_USBPHYC=y
+CONFIG_PINCONF=y
+# CONFIG_SPL_PINCTRL_FULL is not set
+CONFIG_PINCTRL_STMFX=y
+CONFIG_DM_PMIC=y
+# CONFIG_SPL_PMIC_CHILDREN is not set
+CONFIG_PMIC_STPMIC1=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_REGULATOR_STM32_VREFBUF=y
+CONFIG_DM_REGULATOR_STPMIC1=y
+CONFIG_REMOTEPROC_STM32_COPRO=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_STM32=y
+CONFIG_SERIAL_RX_BUFFER=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_STM32_QSPI=y
+CONFIG_STM32_SPI=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_DM_USB_GADGET=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="dh"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0483
+CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
+CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_DM_VIDEO=y
+CONFIG_BACKLIGHT_GPIO=y
+CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
+CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
+CONFIG_VIDEO_STM32=y
+CONFIG_VIDEO_STM32_DSI=y
+CONFIG_VIDEO_STM32_MAX_XRES=1280
+CONFIG_VIDEO_STM32_MAX_YRES=800
+CONFIG_LZO=y
+CONFIG_FDT_FIXUP_PARTITIONS=y
+diff --git a/configs/stm32mp15_optee_defconfig b/configs/stm32mp15_optee_defconfig
+deleted file mode 100644
+index f9161fd..0000000
+--- a/configs/stm32mp15_optee_defconfig
+++ /dev/null
+@@ -1,129 +0,0 @@
+-CONFIG_ARM=y
+-CONFIG_ARCH_STM32MP=y
+-CONFIG_SYS_MALLOC_F_LEN=0x3000
+-CONFIG_TARGET_STM32MP1=y
+-CONFIG_STM32MP1_OPTEE=y
+-CONFIG_DISTRO_DEFAULTS=y
+-CONFIG_FIT=y
+-CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
+-CONFIG_SYS_PROMPT="STM32MP> "
+-# CONFIG_CMD_BOOTD is not set
+-# CONFIG_CMD_ELF is not set
+-# CONFIG_CMD_IMI is not set
+-# CONFIG_CMD_XIMG is not set
+-# CONFIG_CMD_EXPORTENV is not set
+-# CONFIG_CMD_IMPORTENV is not set
+-CONFIG_CMD_MEMINFO=y
+-CONFIG_CMD_MEMTEST=y
+-CONFIG_CMD_ADC=y
+-CONFIG_CMD_CLK=y
+-CONFIG_CMD_DFU=y
+-CONFIG_CMD_FUSE=y
+-CONFIG_CMD_GPIO=y
+-CONFIG_CMD_GPT=y
+-CONFIG_CMD_I2C=y
+-CONFIG_CMD_MMC=y
+-CONFIG_CMD_MTD=y
+-CONFIG_CMD_REMOTEPROC=y
+-CONFIG_CMD_SPI=y
+-CONFIG_CMD_USB=y
+-CONFIG_CMD_USB_MASS_STORAGE=y
+-CONFIG_CMD_BMP=y
+-CONFIG_CMD_CACHE=y
+-CONFIG_CMD_TIME=y
+-CONFIG_CMD_TIMER=y
+-CONFIG_CMD_PMIC=y
+-CONFIG_CMD_REGULATOR=y
+-CONFIG_CMD_EXT4_WRITE=y
+-CONFIG_CMD_MTDPARTS=y
+-CONFIG_CMD_UBI=y
+-CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
+-CONFIG_ENV_IS_NOWHERE=y
+-CONFIG_ENV_IS_IN_EXT4=y
+-CONFIG_ENV_IS_IN_SPI_FLASH=y
+-CONFIG_ENV_IS_IN_UBI=y
+-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
+-CONFIG_ENV_EXT4_INTERFACE="mmc"
+-CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
+-CONFIG_ENV_EXT4_FILE="/uboot.env"
+-CONFIG_ENV_OFFSET_REDUND=0x2C0000
+-CONFIG_ENV_UBI_PART="UBI"
+-CONFIG_ENV_UBI_VOLUME="uboot_config"
+-CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r"
+-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+-CONFIG_STM32_ADC=y
+-CONFIG_DFU_MMC=y
+-CONFIG_DFU_RAM=y
+-CONFIG_DFU_MTD=y
+-CONFIG_DFU_VIRT=y
+-CONFIG_USB_FUNCTION_FASTBOOT=y
+-CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
+-CONFIG_FASTBOOT_BUF_SIZE=0x02000000
+-CONFIG_FASTBOOT_USB_DEV=1
+-CONFIG_FASTBOOT_FLASH=y
+-CONFIG_FASTBOOT_FLASH_MMC_DEV=1
+-CONFIG_DM_HWSPINLOCK=y
+-CONFIG_HWSPINLOCK_STM32=y
+-CONFIG_DM_I2C=y
+-CONFIG_SYS_I2C_STM32F7=y
+-CONFIG_LED=y
+-CONFIG_LED_GPIO=y
+-CONFIG_DM_MAILBOX=y
+-CONFIG_STM32_IPCC=y
+-CONFIG_DM_MMC=y
+-CONFIG_SUPPORT_EMMC_BOOT=y
+-CONFIG_STM32_SDMMC2=y
+-CONFIG_MTD=y
+-CONFIG_DM_MTD=y
+-CONFIG_MTD_RAW_NAND=y
+-CONFIG_NAND_STM32_FMC2=y
+-CONFIG_MTD_SPI_NAND=y
+-CONFIG_DM_SPI_FLASH=y
+-CONFIG_SPI_FLASH_MACRONIX=y
+-CONFIG_SPI_FLASH_SPANSION=y
+-CONFIG_SPI_FLASH_STMICRO=y
+-CONFIG_SPI_FLASH_WINBOND=y
+-# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+-CONFIG_SPI_FLASH_MTD=y
+-CONFIG_DM_ETH=y
+-CONFIG_DWC_ETH_QOS=y
+-CONFIG_PHY=y
+-CONFIG_PHY_STM32_USBPHYC=y
+-CONFIG_PINCONF=y
+-CONFIG_PINCTRL_STMFX=y
+-CONFIG_DM_PMIC=y
+-CONFIG_PMIC_STPMIC1=y
+-CONFIG_DM_REGULATOR_FIXED=y
+-CONFIG_DM_REGULATOR_GPIO=y
+-CONFIG_DM_REGULATOR_STM32_VREFBUF=y
+-CONFIG_DM_REGULATOR_STPMIC1=y
+-CONFIG_REMOTEPROC_STM32_COPRO=y
+-CONFIG_DM_RTC=y
+-CONFIG_RTC_STM32=y
+-CONFIG_SERIAL_RX_BUFFER=y
+-CONFIG_SPI=y
+-CONFIG_DM_SPI=y
+-CONFIG_STM32_QSPI=y
+-CONFIG_STM32_SPI=y
+-CONFIG_USB=y
+-CONFIG_DM_USB=y
+-CONFIG_DM_USB_GADGET=y
+-CONFIG_USB_EHCI_HCD=y
+-CONFIG_USB_EHCI_GENERIC=y
+-CONFIG_USB_GADGET=y
+-CONFIG_USB_GADGET_MANUFACTURER="STMicroelectronics"
+-CONFIG_USB_GADGET_VENDOR_NUM=0x0483
+-CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
+-CONFIG_USB_GADGET_DWC2_OTG=y
+-CONFIG_DM_VIDEO=y
+-CONFIG_BACKLIGHT_GPIO=y
+-CONFIG_VIDEO_BPP8=y
+-CONFIG_VIDEO_BPP16=y
+-CONFIG_VIDEO_BPP32=y
+-CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
+-CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
+-CONFIG_VIDEO_STM32=y
+-CONFIG_VIDEO_STM32_DSI=y
+-CONFIG_VIDEO_STM32_MAX_XRES=1280
+-CONFIG_VIDEO_STM32_MAX_YRES=800
+-CONFIG_FDT_FIXUP_PARTITIONS=y
+diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
+index a5ea528..e248b7d 100644
+--- a/configs/stm32mp15_trusted_defconfig
+++ b/configs/stm32mp15_trusted_defconfig
+@@ -1,17 +1,23 @@
+ CONFIG_ARM=y
+ CONFIG_ARCH_STM32MP=y
+ CONFIG_SYS_MALLOC_F_LEN=0x3000
+-CONFIG_TARGET_STM32MP1=y
+CONFIG_ENV_OFFSET=0x280000
+CONFIG_TARGET_ST_STM32MP15x=y
+CONFIG_CMD_STM32PROG=y
+CONFIG_ENV_SECT_SIZE=0x40000
+CONFIG_ENV_OFFSET_REDUND=0x2C0000
+ CONFIG_DISTRO_DEFAULTS=y
+ CONFIG_FIT=y
+ CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
+ CONFIG_SYS_PROMPT="STM32MP> "
+ # CONFIG_CMD_BOOTD is not set
+CONFIG_CMD_DTIMG=y
+ # CONFIG_CMD_ELF is not set
+ # CONFIG_CMD_IMI is not set
+ # CONFIG_CMD_XIMG is not set
+ # CONFIG_CMD_EXPORTENV is not set
+ # CONFIG_CMD_IMPORTENV is not set
+CONFIG_CMD_ERASEENV=y
+ CONFIG_CMD_MEMINFO=y
+ CONFIG_CMD_MEMTEST=y
+ CONFIG_CMD_ADC=y
+@@ -19,10 +25,8 @@ CONFIG_CMD_CLK=y
+ CONFIG_CMD_DFU=y
+ CONFIG_CMD_FUSE=y
+ CONFIG_CMD_GPIO=y
+-CONFIG_CMD_GPT=y
+ CONFIG_CMD_I2C=y
+ CONFIG_CMD_MMC=y
+-CONFIG_CMD_MTD=y
+ CONFIG_CMD_REMOTEPROC=y
+ CONFIG_CMD_SPI=y
+ CONFIG_CMD_USB=y
+@@ -38,29 +42,32 @@ CONFIG_CMD_MTDPARTS=y
+ CONFIG_CMD_UBI=y
+ CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
+ CONFIG_ENV_IS_NOWHERE=y
+-CONFIG_ENV_IS_IN_EXT4=y
+CONFIG_ENV_IS_IN_MMC=y
+ CONFIG_ENV_IS_IN_SPI_FLASH=y
+ CONFIG_ENV_IS_IN_UBI=y
+ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
+-CONFIG_ENV_EXT4_INTERFACE="mmc"
+-CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
+-CONFIG_ENV_EXT4_FILE="/uboot.env"
+-CONFIG_ENV_OFFSET_REDUND=0x2C0000
+ CONFIG_ENV_UBI_PART="UBI"
+ CONFIG_ENV_UBI_VOLUME="uboot_config"
+ CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r"
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_STM32_ADC=y
+-CONFIG_DFU_MMC=y
+-CONFIG_DFU_RAM=y
+-CONFIG_DFU_MTD=y
+-CONFIG_DFU_VIRT=y
+CONFIG_CLK_SCMI=y
+CONFIG_SET_DFU_ALT_INFO=y
+ CONFIG_USB_FUNCTION_FASTBOOT=y
+ CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
+ CONFIG_FASTBOOT_BUF_SIZE=0x02000000
+ CONFIG_FASTBOOT_USB_DEV=1
+ CONFIG_FASTBOOT_FLASH=y
+ CONFIG_FASTBOOT_FLASH_MMC_DEV=1
+CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y
+CONFIG_FASTBOOT_MMC_BOOT1_NAME="mmc1boot0"
+CONFIG_FASTBOOT_MMC_BOOT2_NAME="mmc1boot1"
+CONFIG_FASTBOOT_MMC_USER_SUPPORT=y
+CONFIG_FASTBOOT_MMC_USER_NAME="mmc1"
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_FASTBOOT_CMD_OEM_PARTCONF=y
+CONFIG_FASTBOOT_CMD_OEM_BOOTBUS=y
+CONFIG_GPIO_HOG=y
+ CONFIG_DM_HWSPINLOCK=y
+ CONFIG_HWSPINLOCK_STM32=y
+ CONFIG_DM_I2C=y
+@@ -69,11 +76,13 @@ CONFIG_LED=y
+ CONFIG_LED_GPIO=y
+ CONFIG_DM_MAILBOX=y
+ CONFIG_STM32_IPCC=y
+CONFIG_ARM_SMC_MAILBOX=y
+ CONFIG_DM_MMC=y
+ CONFIG_SUPPORT_EMMC_BOOT=y
+ CONFIG_STM32_SDMMC2=y
+ CONFIG_MTD=y
+ CONFIG_DM_MTD=y
+CONFIG_SYS_MTDPARTS_RUNTIME=y
+ CONFIG_MTD_RAW_NAND=y
+ CONFIG_NAND_STM32_FMC2=y
+ CONFIG_MTD_SPI_NAND=y
+@@ -84,6 +93,7 @@ CONFIG_SPI_FLASH_STMICRO=y
+ CONFIG_SPI_FLASH_WINBOND=y
+ # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+ CONFIG_SPI_FLASH_MTD=y
+CONFIG_PHY_REALTEK=y
+ CONFIG_DM_ETH=y
+ CONFIG_DWC_ETH_QOS=y
+ CONFIG_PHY=y
+@@ -97,6 +107,7 @@ CONFIG_DM_REGULATOR_GPIO=y
+ CONFIG_DM_REGULATOR_STM32_VREFBUF=y
+ CONFIG_DM_REGULATOR_STPMIC1=y
+ CONFIG_REMOTEPROC_STM32_COPRO=y
+CONFIG_RESET_SCMI=y
+ CONFIG_DM_RTC=y
+ CONFIG_RTC_STM32=y
+ CONFIG_SERIAL_RX_BUFFER=y
+@@ -104,6 +115,9 @@ CONFIG_SPI=y
+ CONFIG_DM_SPI=y
+ CONFIG_STM32_QSPI=y
+ CONFIG_STM32_SPI=y
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+# CONFIG_OPTEE_TA_AVB is not set
+ CONFIG_USB=y
+ CONFIG_DM_USB=y
+ CONFIG_DM_USB_GADGET=y
+@@ -125,4 +139,7 @@ CONFIG_VIDEO_STM32=y
+ CONFIG_VIDEO_STM32_DSI=y
+ CONFIG_VIDEO_STM32_MAX_XRES=1280
+ CONFIG_VIDEO_STM32_MAX_YRES=800
+CONFIG_WDT=y
+CONFIG_WDT_STM32MP=y
+CONFIG_ERRNO_STR=y
+ CONFIG_FDT_FIXUP_PARTITIONS=y
+-- 
+2.7.4
+
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0006-ARM-v2018.11-stm32mp-r2-MACHINE.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0006-ARM-v2018.11-stm32mp-r2-MACHINE.patch
@ -1,237 +0,0 @@
-From 761f1ccf48cd083baa2bf3a120f8f1da993af217 Mon Sep 17 00:00:00 2001
-From: christophe montaud <christophe.montaud@st.com>
-Date: Mon, 28 Jan 2019 11:04:22 +0100
-Subject: [PATCH 6/8] ARM v2018.11 stm32mp r2 MACHINE
-
---
- arch/arm/mach-stm32mp/Kconfig                      |  13 +++
- arch/arm/mach-stm32mp/Makefile                     |   1 +
- .../arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c |  22 ++++
- arch/arm/mach-stm32mp/include/mach/stm32.h         |   3 +
- arch/arm/mach-stm32mp/stm32mp1_helper_dgb.S        | 124 +++++++++++++++++++++
- 5 files changed, 163 insertions(+)
- create mode 100644 arch/arm/mach-stm32mp/stm32mp1_helper_dgb.S
-
-diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig
-index 0c68c24..fbc8195 100644
--- a/arch/arm/mach-stm32mp/Kconfig
-+++ b/arch/arm/mach-stm32mp/Kconfig
-@@ -47,6 +47,19 @@ config TARGET_STM32MP1
- 		STMicroelectronics MPU with core ARMv7
- 		dual core A7 for STM32MP153, monocore for STM32MP151
- 
-+config STM32MP1_RESET_HALT_WORKAROUND
-+	bool "workaround for reset halt deubg on stm32mp15x"
-+	depends on TARGET_STM32MP1
-+	default y
-+	help
-+		Activate a workaround for current STM32MP15x revision B
-+		limitation on debug reset halt not handle by ROM code:
-+		add a delay loop early in the SPL boot process to wait for
-+		the debugger to attach
-+		it can be removed when using the Soc revision
-+		that fixes the limitation.
-+
-+
- config STM32MP1_TRUSTED
- 	bool "Support trusted boot with TF-A"
- 	default y if !SPL
-diff --git a/arch/arm/mach-stm32mp/Makefile b/arch/arm/mach-stm32mp/Makefile
-index 09636db..c67bcce 100644
--- a/arch/arm/mach-stm32mp/Makefile
-+++ b/arch/arm/mach-stm32mp/Makefile
-@@ -9,6 +9,7 @@ obj-y += syscon.o
- 
- ifdef CONFIG_SPL_BUILD
- obj-y += spl.o
-+obj-$(CONFIG_STM32MP1_RESET_HALT_WORKAROUND) += stm32mp1_helper_dgb.o
- else
- obj-$(CONFIG_CMD_STM32PROG) += cmd_stm32prog/
- obj-$(CONFIG_CMD_STM32KEY) += cmd_stm32key.o
-diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
-index d1c07dc..a6ee0f2 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
-+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
-@@ -10,6 +10,26 @@
- 
- DECLARE_GLOBAL_DATA_PTR;
- 
-+static void enable_vidconsole(void)
-+{
-+#ifdef CONFIG_DM_VIDEO
-+	char *stdname;
-+	char buf[64];
-+
-+	stdname = env_get("stdout");
-+	if (!strstr(stdname, "vidconsole")) {
-+		snprintf(buf, sizeof(buf), "%s,vidconsole", stdname);
-+		env_set("stdout", buf);
-+	}
-+
-+	stdname = env_get("stderr");
-+	if (!strstr(stdname, "vidconsole")) {
-+		snprintf(buf, sizeof(buf), "%s,vidconsole", stdname);
-+		env_set("stderr", buf);
-+	}
-+#endif
-+}
-+
- static int do_stm32prog(cmd_tbl_t *cmdtp, int flag, int argc,
- 			char * const argv[])
- {
-@@ -44,6 +64,8 @@ static int do_stm32prog(cmd_tbl_t *cmdtp, int flag, int argc,
- 	if (argc > 4)
- 		size = simple_strtoul(argv[4], NULL, 16);
- 
-+	enable_vidconsole();
-+
- 	data = stm32prog_init(link, dev, addr, size);
- 	if (!data)
- 		return CMD_RET_FAILURE;
-diff --git a/arch/arm/mach-stm32mp/include/mach/stm32.h b/arch/arm/mach-stm32mp/include/mach/stm32.h
-index 4147873..36b885b 100644
--- a/arch/arm/mach-stm32mp/include/mach/stm32.h
-+++ b/arch/arm/mach-stm32mp/include/mach/stm32.h
-@@ -35,6 +35,9 @@
- #define STM32_DDR_BASE			0xC0000000
- #define STM32_DDR_SIZE			SZ_1G
- 
-+#define STM32_RETRAM_BASE		0x38000000
-+#define STM32_RETRAM_SIZE		0x00010000
-+
- #ifndef __ASSEMBLY__
- #include <asm/types.h>
- 
-diff --git a/arch/arm/mach-stm32mp/stm32mp1_helper_dgb.S b/arch/arm/mach-stm32mp/stm32mp1_helper_dgb.S
-new file mode 100644
-index 0000000..29f8e1f
--- /dev/null
-+++ b/arch/arm/mach-stm32mp/stm32mp1_helper_dgb.S
-@@ -0,0 +1,124 @@
-+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
-+/*
-+ * Copyright (c) 2019, STMicroelectronics - All Rights Reserved
-+ *
-+ */
-+
-+/*****************************************************************************
-+ * This file is only needed for current Soc revision which has a limitation on
-+ * debug reset halt. This can be removed when using the Soc revision that
-+ * fixes the limitation. Anyway, this source code identifies the Soc revision
-+ * and is only executed if it corresponds, so it can be kept on other
-+ * revisions without any consequence.
-+ ****************************************************************************/
-+
-+#include <linux/linkage.h>
-+#include <asm/macro.h>
-+
-+#define BIT(nr)				(1 << (nr))
-+
-+#define DBG_DSCR_ADDR			0x500D0088
-+#define DBG_DSCR_HDBGEN			BIT(14)
-+
-+#define RCC_DBGCFGR_ADDR		0x5000080C
-+#define RCC_DBGCFGR_DBGCKEN		BIT(8)
-+
-+#define PWR_CR1_ADDR			0x50001000
-+#define PWR_CR1_DBP			BIT(8)
-+
-+#define DBGMCU_IDC_ADDR			0x50081000
-+#define DBGMCU_IDC_MASK			0xFFFF0FFF
-+#define DBGMCU_IDC_VALUE		0x20000500
-+
-+#define TAMP_BKP_REGISTER_20		(0x5C00A100 + (20 << 2))
-+
-+
-+	.globl	save_boot_params
-+
-+ENTRY(save_boot_params)
-+	/*
-+	 * This function is the first call after reset.
-+	 * Boot rom parameters are stored in r0..r3, so we mustn't use them
-+	 * here. And because they are saved in r9..r12 just after the
-+	 * execution of this function, we should firstly use these registers.
-+	 * And then, if more registers needed, we have to start by using
-+	 * r8, and then r7 and so on. By this way, debug will be done in
-+	 * conditions closed to the initial context.
-+	 */
-+
-+	/* Check Soc revision */
-+	ldr	r12, =RCC_DBGCFGR_ADDR
-+	ldr	r11, [r12]		/* read RCC_DBGCFGR (r11) */
-+	orr	r10, r11, #RCC_DBGCFGR_DBGCKEN
-+	str	r10, [r12]		/* update RCC_DBGCFGR */
-+	ldr	r10, =DBGMCU_IDC_ADDR
-+	ldr	r10, [r10]		/* read DBGMCU_IDC (r10) */
-+	str	r11, [r12]		/* restore RCC_DBGCFGR (r11) */
-+	ldr	r12, =DBGMCU_IDC_MASK
-+	and	r10, r12		/* mask reserved bits */
-+	ldr	r11, =DBGMCU_IDC_VALUE
-+	teq	r10, r11		/* test DBGMCU_IDC */
-+	bne	func_exit
-+
-+	/* Disable the backup domain write protection */
-+	ldr	r12, =PWR_CR1_ADDR
-+	ldr	r11, [r12]
-+	orr	r11, r11, #PWR_CR1_DBP
-+	str	r11, [r12]
-+poll_dbp:
-+	ldr	r11, [r12]
-+	tst	r11, #PWR_CR1_DBP
-+	beq	poll_dbp
-+
-+	/* Clear tamper 20 bit 16 if set */
-+	ldr	r12, =TAMP_BKP_REGISTER_20
-+	ldr	r11, [r12]
-+	tst	r11, #(BIT(16))
-+	beq	func_exit
-+	bic	r11, #(BIT(16))
-+	str	r11, [r12]
-+
-+	/* Re-enable the backup domain write protection */
-+	ldr	r12, =PWR_CR1_ADDR
-+	ldr	r11, [r12]
-+	bic	r11, #PWR_CR1_DBP
-+	str	r11, [r12]
-+poll_dbp_2:
-+	ldr	r11, [r12]
-+	tst	r11, #PWR_CR1_DBP
-+	bne	poll_dbp_2
-+
-+	/* Get current time + 1 second */
-+	/* CNTFRQ */
-+	mrc	p15, 0, r12, c14, c0, 0
-+	/* CNTPCT_64 */
-+	mrrc	p15, 0, r11, r10, c14
-+	add	r12, r12, r11
-+
-+loop:
-+	/* Check A7 DBG_DSCR HDBGEN bit value */
-+	ldr	r10, =DBG_DSCR_ADDR
-+	ldr	r10, [r10]
-+	tst	r10, #DBG_DSCR_HDBGEN
-+	beq	loop_continue
-+	/* Sw break */
-+	bkpt	5
-+	/* Jump entrypoint */
-+	b	reset
-+loop_continue:
-+	/* Check 1 second expiration */
-+	mrrc	p15, 0, r10, r9, c14
-+	/* Check if MSB 64-bit increment needed */
-+	cmp	r12, r11
-+	bmi	msb_incr
-+	cmp	r12, r10
-+	bmi	func_exit
-+	b	loop
-+msb_incr:
-+	cmp	r12, r10
-+	bpl	loop
-+	cmp	r11, r10
-+	bmi	loop
-+func_exit:
-+	b	save_boot_params_ret
-+ENDPROC(save_boot_params)
-- 
-2.7.4
-
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0007-ARM-v2018.11-stm32mp-r2-DEVICETREE.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0007-ARM-v2018.11-stm32mp-r2-DEVICETREE.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0008-ARM-v2018.11-stm32mp-r2-MISC.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0008-ARM-v2018.11-stm32mp-r2-MISC.patch
@ -1,290 +0,0 @@
-From 8db9dfe442ded4ec2d320d61a5b92d9bc1c771d4 Mon Sep 17 00:00:00 2001
-From: christophe montaud <christophe.montaud@st.com>
-Date: Mon, 28 Jan 2019 11:07:22 +0100
-Subject: [PATCH 8/8] ARM v2018.11 stm32mp r2 MISC
-
---
- Makefile                          |  2 +-
- drivers/remoteproc/rproc-uclass.c | 10 +++++++--
- drivers/remoteproc/stm32_copro.c  | 44 +++++++++++++++------------------------
- drivers/video/stm32/stm32_dsi.c   | 41 ++++++++++++++++++++++--------------
- 4 files changed, 51 insertions(+), 46 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 84cb372..693ffae 100644
--- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- VERSION = 2018
- PATCHLEVEL = 11
- SUBLEVEL =
-EXTRAVERSION = -stm32mp-r1
-+EXTRAVERSION = -stm32mp-r2
- NAME =
- 
- # *DOCUMENTATION*
-diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
-index 8ea92f7..204e6e8 100644
--- a/drivers/remoteproc/rproc-uclass.c
-+++ b/drivers/remoteproc/rproc-uclass.c
-@@ -449,7 +449,10 @@ static int rproc_load_elf_image(struct udevice *dev, unsigned long addr,
- 		if (phdr->p_filesz != phdr->p_memsz)
- 			memset(dst + phdr->p_filesz, 0x00,
- 			       phdr->p_memsz - phdr->p_filesz);
-		flush_cache((unsigned long)dst, phdr->p_filesz);
-+		flush_cache(rounddown((int)dst, ARCH_DMA_MINALIGN),
-+			    roundup((int)dst + phdr->p_filesz,
-+				    ARCH_DMA_MINALIGN) -
-+			    rounddown((int)dst, ARCH_DMA_MINALIGN));
- 		++phdr;
- 	}
- 
-@@ -561,7 +564,10 @@ static int rproc_elf_find_load_rsc_table(struct udevice *dev,
- 	src = (void *)fw_addr + shdr->sh_offset;
- 
- 	memcpy(dst, src, shdr->sh_size);
-	flush_cache((unsigned long)dst, shdr->sh_size);
-+	flush_cache(rounddown((int)dst, ARCH_DMA_MINALIGN),
-+		    roundup((int)dst + shdr->sh_size,
-+			    ARCH_DMA_MINALIGN) -
-+		    rounddown((int)dst, ARCH_DMA_MINALIGN));
- 
- 	return 0;
- }
-diff --git a/drivers/remoteproc/stm32_copro.c b/drivers/remoteproc/stm32_copro.c
-index 310d077..44230ff 100644
--- a/drivers/remoteproc/stm32_copro.c
-+++ b/drivers/remoteproc/stm32_copro.c
-@@ -18,7 +18,6 @@
- 
- /**
-  * struct stm32_copro_privdata - power processor private data
- * @loadaddr:	base address for loading the power processor
-  * @reset_ctl:	reset controller handle
-  * @hold_boot_regmap
-  * @hold_boot_offset
-@@ -26,7 +25,6 @@
-  * @secured_soc:	TZEN flag (register protection)
-  */
- struct stm32_copro_privdata {
-	phys_addr_t loadaddr;
- 	struct reset_ctl reset_ctl;
- 	struct regmap *hold_boot_regmap;
- 	uint hold_boot_offset;
-@@ -46,21 +44,9 @@ static int st_of_to_priv(struct udevice *dev,
- {
- 	struct regmap *regmap;
- 	const fdt32_t *cell;
-	const void *blob = gd->fdt_blob;
- 	uint tz_offset, tz_mask, tzen;
- 	int len, ret;
- 
-	if (!blob) {
-		dev_dbg(dev, "no dt?\n");
-		return -EINVAL;
-	}
-
-	priv->loadaddr = dev_read_addr(dev);
-	if (priv->loadaddr == FDT_ADDR_T_NONE) {
-		dev_dbg(dev, "no 'reg' property\n");
-		return -EINVAL;
-	}
-
- 	regmap = syscon_phandle_to_regmap(dev, "st,syscfg-holdboot");
- 	if (IS_ERR(regmap)) {
- 		dev_dbg(dev, "unable to find holdboot regmap (%ld)\n",
-@@ -123,8 +109,7 @@ static int stm32_copro_probe(struct udevice *dev)
- 
- 	ret = st_of_to_priv(dev, priv);
- 
-	dev_dbg(dev, "probed with slave_addr=0x%08lX (%d)\n",
-		priv->loadaddr, ret);
-+	dev_dbg(dev, "probed (%d)\n", ret);
- 
- 	return ret;
- }
-@@ -163,6 +148,17 @@ static int stm32_copro_set_hold_boot(struct udevice *dev, bool hold)
- 	return ret;
- }
- 
-+static ulong stm32_copro_da_to_pa(struct udevice *dev, ulong da)
-+{
-+	/* to update with address translate by DT range  */
-+
-+	/* CM4 boot at address 0x0 = RETRAM alias, not available for CA7 load */
-+	if (da >= 0 && da < STM32_RETRAM_SIZE)
-+		return (da + STM32_RETRAM_BASE);
-+
-+	return da;
-+}
-+
- /**
-  * stm32_copro_load() - Loadup the STM32 Cortex-M4 remote processor
-  * @dev:	corresponding STM32 remote processor device
-@@ -174,6 +170,7 @@ static int stm32_copro_set_hold_boot(struct udevice *dev, bool hold)
- static int stm32_copro_load(struct udevice *dev, ulong addr, ulong size)
- {
- 	struct stm32_copro_privdata *priv;
-+	phys_addr_t loadaddr;
- 	int ret;
- 
- 	priv = dev_get_priv(dev);
-@@ -186,10 +183,12 @@ static int stm32_copro_load(struct udevice *dev, ulong addr, ulong size)
- 		return ret;
- 	}
- 
-+	/* by default load for copro BOOT address = 0x0 */
-+	loadaddr = stm32_copro_da_to_pa(dev, 0x0);
- 	dev_dbg(dev, "Loading binary from 0x%08lX, size 0x%08lX to 0x%08lX\n",
-		addr, size, priv->loadaddr);
-+		addr, size, loadaddr);
- 
-	memcpy((void *)priv->loadaddr, (void *)addr, size);
-+	memcpy((void *)loadaddr, (void *)addr, size);
- 
- 	dev_dbg(dev, "Complete!\n");
- 	return 0;
-@@ -241,15 +240,6 @@ static int stm32_copro_reset(struct udevice *dev)
- 	return 0;
- }
- 
-ulong stm32_copro_da_to_pa(struct udevice *dev, ulong da)
-{
-	/* to update according to lastest DT */
-	if (da >= 0 && da < 0x10000)
-		return (da + 0x38000000);
-
-	return da;
-}
-
- static const struct dm_rproc_ops stm32_copro_ops = {
- 	.load = stm32_copro_load,
- 	.start = stm32_copro_start,
-diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
-index 09266fe..f8f7c83 100644
--- a/drivers/video/stm32/stm32_dsi.c
-+++ b/drivers/video/stm32/stm32_dsi.c
-@@ -242,7 +242,6 @@ static int dsi_get_lane_mbps(void *priv_data, struct display_timing *timings,
- 	u32 val;
- 
- 	/* Update lane capabilities according to hw version */
-	dsi->hw_version = dsi_read(dsi, DSI_VERSION) & VERSION;
- 	dsi->lane_min_kbps = LANE_MIN_KBPS;
- 	dsi->lane_max_kbps = LANE_MAX_KBPS;
- 	if (dsi->hw_version == HWVER_131) {
-@@ -310,9 +309,9 @@ static const struct dw_mipi_dsi_phy_ops dw_mipi_dsi_stm_phy_ops = {
- 
- static int stm32_dsi_attach(struct udevice *dev)
- {
-	struct stm32_dsi_priv *priv = dev_get_priv(dev);
-+	struct stm32_dsi_priv *dsi = dev_get_priv(dev);
- 	struct dw_mipi_dsi_plat_data *platdata = dev_get_platdata(dev);
-	struct mipi_dsi_device *device = &priv->device;
-+	struct mipi_dsi_device *device = &dsi->device;
- 	int ret;
- 
- 	platdata->max_data_lanes = 2;
-@@ -336,8 +335,8 @@ static int stm32_dsi_attach(struct udevice *dev)
- static int stm32_dsi_set_backlight(struct udevice *dev, int percent)
- {
- 	struct dw_mipi_dsi_plat_data *dplat = dev_get_platdata(dev);
-	struct stm32_dsi_priv *priv = dev_get_priv(dev);
-	struct mipi_dsi_device *device = &priv->device;
-+	struct stm32_dsi_priv *dsi = dev_get_priv(dev);
-+	struct mipi_dsi_device *device = &dsi->device;
- 	struct udevice *panel = dplat->panel;
- 	struct mipi_dsi_panel_plat *mplat;
- 	int ret;
-@@ -359,29 +358,29 @@ static int stm32_dsi_set_backlight(struct udevice *dev, int percent)
- 
- static int stm32_dsi_probe(struct udevice *dev)
- {
-	struct stm32_dsi_priv *priv = dev_get_priv(dev);
-	struct mipi_dsi_device *device = &priv->device;
-+	struct stm32_dsi_priv *dsi = dev_get_priv(dev);
-+	struct mipi_dsi_device *device = &dsi->device;
- 	struct reset_ctl rst;
- 	struct clk clk;
- 	int ret;
- 
- 	device->dev = dev;
- 
-	priv->base = (void *)dev_read_addr(dev);
-	if ((fdt_addr_t)priv->base == FDT_ADDR_T_NONE) {
-+	dsi->base = (void *)dev_read_addr(dev);
-+	if ((fdt_addr_t)dsi->base == FDT_ADDR_T_NONE) {
- 		dev_err(dev, "dsi dt register address error\n");
- 		return -EINVAL;
- 	}
- 
- 	if (IS_ENABLED(CONFIG_DM_REGULATOR)) {
- 		ret =  device_get_supply_regulator(dev, "phy-dsi-supply",
-						   &priv->vdd_reg);
-+						   &dsi->vdd_reg);
- 		if (ret && ret != -ENOENT) {
- 			dev_err(dev, "Warning: cannot get phy dsi supply\n");
- 			return -ENODEV;
- 		}
- 
-		ret = regulator_set_enable(priv->vdd_reg, true);
-+		ret = regulator_set_enable(dsi->vdd_reg, true);
- 		if (ret)
- 			return -ENODEV;
- 	}
-@@ -389,14 +388,14 @@ static int stm32_dsi_probe(struct udevice *dev)
- 	ret = clk_get_by_name(device->dev, "pclk", &clk);
- 	if (ret) {
- 		dev_err(dev, "peripheral clock get error %d\n", ret);
-		regulator_set_enable(priv->vdd_reg, false);
-+		regulator_set_enable(dsi->vdd_reg, false);
- 		return -ENODEV;
- 	}
- 
- 	ret = clk_enable(&clk);
- 	if (ret) {
- 		dev_err(dev, "peripheral clock enable error %d\n", ret);
-		regulator_set_enable(priv->vdd_reg, false);
-+		regulator_set_enable(dsi->vdd_reg, false);
- 		return -ENODEV;
- 	}
- 
-@@ -404,23 +403,33 @@ static int stm32_dsi_probe(struct udevice *dev)
- 	if (ret) {
- 		dev_err(dev, "pll reference clock get error %d\n", ret);
- 		clk_disable(&clk);
-		regulator_set_enable(priv->vdd_reg, false);
-+		regulator_set_enable(dsi->vdd_reg, false);
- 		return ret;
- 	}
- 
-	priv->pllref_clk = (unsigned int)clk_get_rate(&clk);
-+	dsi->pllref_clk = (unsigned int)clk_get_rate(&clk);
- 
- 	ret = reset_get_by_index(device->dev, 0, &rst);
- 	if (ret) {
- 		dev_err(dev, "missing dsi hardware reset\n");
- 		clk_disable(&clk);
-		regulator_set_enable(priv->vdd_reg, false);
-+		regulator_set_enable(dsi->vdd_reg, false);
- 		return -ENODEV;
- 	}
- 
- 	/* Reset */
- 	reset_deassert(&rst);
- 
-+	/* check hardware version */
-+	dsi->hw_version = dsi_read(dsi, DSI_VERSION) & VERSION;
-+	if (dsi->hw_version != HWVER_130 &&
-+	    dsi->hw_version != HWVER_131) {
-+		dev_err(dev, "bad dsi hardware version\n");
-+		clk_disable(&clk);
-+		regulator_set_enable(dsi->vdd_reg, false);
-+		return -ENODEV;
-+	}
-+
- 	return 0;
- }
- 
-- 
-2.7.4
-
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0009-ARM-v2018.11-stm32mp-r3-MACHINE.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0009-ARM-v2018.11-stm32mp-r3-MACHINE.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0010-ARM-v2018.11-stm32mp-r3-BOARD.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0010-ARM-v2018.11-stm32mp-r3-BOARD.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0011-ARM-v2018.11-stm32mp-r3-DEVICETREE.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0011-ARM-v2018.11-stm32mp-r3-DEVICETREE.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0012-ARM-v2018.11-stm32mp-r3-CONFIG.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0012-ARM-v2018.11-stm32mp-r3-CONFIG.patch
@ -1,218 +0,0 @@
-From 4407a960368fbc08654cc08ea18856565ec562fb Mon Sep 17 00:00:00 2001
-From: Romuald JEANNE <romuald.jeanne@st.com>
-Date: Tue, 17 Sep 2019 13:55:59 +0200
-Subject: [PATCH 12/13] ARM v2018.11 stm32mp r3 CONFIG
-
---
- configs/stm32mp15_basic_defconfig   | 17 ++++++++++++++---
- configs/stm32mp15_optee_defconfig   | 16 +++++++++++++---
- configs/stm32mp15_trusted_defconfig | 16 +++++++++++++---
- 3 files changed, 40 insertions(+), 9 deletions(-)
-
-diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
-index ad3424e..3eff6b5 100644
--- a/configs/stm32mp15_basic_defconfig
-+++ b/configs/stm32mp15_basic_defconfig
-@@ -9,6 +9,7 @@ CONFIG_SPL_SPI_SUPPORT=y
- # CONFIG_ARMV7_VIRT is not set
- CONFIG_DISTRO_DEFAULTS=y
- CONFIG_FIT=y
-+CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
- CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
- CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3
- CONFIG_SPL_I2C_SUPPORT=y
-@@ -16,6 +17,7 @@ CONFIG_SPL_MTD_SUPPORT=y
- CONFIG_SPL_POWER_SUPPORT=y
- CONFIG_SYS_PROMPT="STM32MP> "
- # CONFIG_CMD_BOOTD is not set
-+CONFIG_CMD_DTIMG=y
- # CONFIG_CMD_ELF is not set
- # CONFIG_CMD_IMI is not set
- # CONFIG_CMD_XIMG is not set
-@@ -32,6 +34,7 @@ CONFIG_CMD_I2C=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_REMOTEPROC=y
- CONFIG_CMD_SF=y
-+CONFIG_CMD_SPI=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_USB_MASS_STORAGE=y
- CONFIG_CMD_BMP=y
-@@ -45,6 +48,14 @@ CONFIG_CMD_MTDPARTS=y
- CONFIG_CMD_UBI=y
- # CONFIG_SPL_DOS_PARTITION is not set
- CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
-+CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-names interrupts-extended interrupt-controller \\\#interrupt-cells interrupt-parent dmas dma-names assigned-clocks assigned-clock-rates assigned-clock-parents hwlocks"
-+CONFIG_ENV_IS_NOWHERE=y
-+CONFIG_ENV_IS_IN_EXT4=y
-+CONFIG_ENV_IS_IN_SPI_FLASH=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_EXT4_INTERFACE="mmc"
-+CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
-+CONFIG_ENV_EXT4_FILE="/uboot.env"
- CONFIG_STM32_ADC=y
- CONFIG_USB_FUNCTION_FASTBOOT=y
- CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
-@@ -74,7 +85,6 @@ CONFIG_SPI_FLASH_STMICRO=y
- CONFIG_SPI_FLASH_WINBOND=y
- # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
- CONFIG_SPI_FLASH_MTD=y
-CONFIG_PHY_FIXED=y
- CONFIG_DM_ETH=y
- CONFIG_DWC_ETH_QOS=y
- CONFIG_PHY=y
-@@ -91,10 +101,13 @@ CONFIG_DM_REGULATOR_STM32_VREFBUF=y
- CONFIG_DM_REGULATOR_STPMIC1=y
- CONFIG_STM32MP1_DDR_INTERACTIVE=y
- CONFIG_REMOTEPROC_STM32_COPRO=y
-+CONFIG_DM_RTC=y
-+CONFIG_RTC_STM32=y
- CONFIG_SERIAL_RX_BUFFER=y
- CONFIG_SPI=y
- CONFIG_DM_SPI=y
- CONFIG_STM32_QSPI=y
-+CONFIG_STM32_SPI=y
- CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_EHCI_HCD=y
-@@ -113,6 +126,4 @@ 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
-diff --git a/configs/stm32mp15_optee_defconfig b/configs/stm32mp15_optee_defconfig
-index a24727c..9ef8f62 100644
--- a/configs/stm32mp15_optee_defconfig
-+++ b/configs/stm32mp15_optee_defconfig
-@@ -5,8 +5,10 @@ CONFIG_TARGET_STM32MP1=y
- CONFIG_STM32MP1_OPTEE=y
- CONFIG_DISTRO_DEFAULTS=y
- CONFIG_FIT=y
-+CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
- CONFIG_SYS_PROMPT="STM32MP> "
- # CONFIG_CMD_BOOTD is not set
-+CONFIG_CMD_DTIMG=y
- # CONFIG_CMD_ELF is not set
- # CONFIG_CMD_IMI is not set
- # CONFIG_CMD_XIMG is not set
-@@ -23,6 +25,7 @@ CONFIG_CMD_I2C=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_REMOTEPROC=y
- CONFIG_CMD_SF=y
-+CONFIG_CMD_SPI=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_USB_MASS_STORAGE=y
- CONFIG_CMD_BMP=y
-@@ -35,6 +38,13 @@ CONFIG_CMD_EXT4_WRITE=y
- CONFIG_CMD_MTDPARTS=y
- CONFIG_CMD_UBI=y
- CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
-+CONFIG_ENV_IS_NOWHERE=y
-+CONFIG_ENV_IS_IN_EXT4=y
-+CONFIG_ENV_IS_IN_SPI_FLASH=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_EXT4_INTERFACE="mmc"
-+CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
-+CONFIG_ENV_EXT4_FILE="/uboot.env"
- CONFIG_STM32_ADC=y
- CONFIG_USB_FUNCTION_FASTBOOT=y
- CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
-@@ -64,7 +74,6 @@ CONFIG_SPI_FLASH_STMICRO=y
- CONFIG_SPI_FLASH_WINBOND=y
- # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
- CONFIG_SPI_FLASH_MTD=y
-CONFIG_PHY_FIXED=y
- CONFIG_DM_ETH=y
- CONFIG_DWC_ETH_QOS=y
- CONFIG_PHY=y
-@@ -78,10 +87,13 @@ CONFIG_DM_REGULATOR_GPIO=y
- CONFIG_DM_REGULATOR_STM32_VREFBUF=y
- CONFIG_DM_REGULATOR_STPMIC1=y
- CONFIG_REMOTEPROC_STM32_COPRO=y
-+CONFIG_DM_RTC=y
-+CONFIG_RTC_STM32=y
- CONFIG_SERIAL_RX_BUFFER=y
- CONFIG_SPI=y
- CONFIG_DM_SPI=y
- CONFIG_STM32_QSPI=y
-+CONFIG_STM32_SPI=y
- CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_EHCI_HCD=y
-@@ -100,6 +112,4 @@ 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
-diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
-index e41506b..7635d7f 100644
--- a/configs/stm32mp15_trusted_defconfig
-+++ b/configs/stm32mp15_trusted_defconfig
-@@ -4,8 +4,10 @@ CONFIG_SYS_MALLOC_F_LEN=0x3000
- CONFIG_TARGET_STM32MP1=y
- CONFIG_DISTRO_DEFAULTS=y
- CONFIG_FIT=y
-+CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
- CONFIG_SYS_PROMPT="STM32MP> "
- # CONFIG_CMD_BOOTD is not set
-+CONFIG_CMD_DTIMG=y
- # CONFIG_CMD_ELF is not set
- # CONFIG_CMD_IMI is not set
- # CONFIG_CMD_XIMG is not set
-@@ -22,6 +24,7 @@ CONFIG_CMD_I2C=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_REMOTEPROC=y
- CONFIG_CMD_SF=y
-+CONFIG_CMD_SPI=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_USB_MASS_STORAGE=y
- CONFIG_CMD_BMP=y
-@@ -34,6 +37,13 @@ CONFIG_CMD_EXT4_WRITE=y
- CONFIG_CMD_MTDPARTS=y
- CONFIG_CMD_UBI=y
- CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
-+CONFIG_ENV_IS_NOWHERE=y
-+CONFIG_ENV_IS_IN_EXT4=y
-+CONFIG_ENV_IS_IN_SPI_FLASH=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_EXT4_INTERFACE="mmc"
-+CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
-+CONFIG_ENV_EXT4_FILE="/uboot.env"
- CONFIG_STM32_ADC=y
- CONFIG_USB_FUNCTION_FASTBOOT=y
- CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
-@@ -63,7 +73,6 @@ CONFIG_SPI_FLASH_STMICRO=y
- CONFIG_SPI_FLASH_WINBOND=y
- # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
- CONFIG_SPI_FLASH_MTD=y
-CONFIG_PHY_FIXED=y
- CONFIG_DM_ETH=y
- CONFIG_DWC_ETH_QOS=y
- CONFIG_PHY=y
-@@ -77,10 +86,13 @@ CONFIG_DM_REGULATOR_GPIO=y
- CONFIG_DM_REGULATOR_STM32_VREFBUF=y
- CONFIG_DM_REGULATOR_STPMIC1=y
- CONFIG_REMOTEPROC_STM32_COPRO=y
-+CONFIG_DM_RTC=y
-+CONFIG_RTC_STM32=y
- CONFIG_SERIAL_RX_BUFFER=y
- CONFIG_SPI=y
- CONFIG_DM_SPI=y
- CONFIG_STM32_QSPI=y
-+CONFIG_STM32_SPI=y
- CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_EHCI_HCD=y
-@@ -99,6 +111,4 @@ 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.7.4
-
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0013-ARM-v2018.11-stm32mp-r3-MISC.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0013-ARM-v2018.11-stm32mp-r3-MISC.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0014-ARM-v2018.11-stm32mp-r4-MACHINE.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0014-ARM-v2018.11-stm32mp-r4-MACHINE.patch
@ -1,494 +0,0 @@
-From 19120ee9047a8e592c8a82d12a8482ef944f0dda Mon Sep 17 00:00:00 2001
-From: Romuald JEANNE <romuald.jeanne@st.com>
-Date: Thu, 30 Jan 2020 14:55:56 +0100
-Subject: [PATCH 14/17] ARM v2018.11 stm32mp r4 MACHINE
-
---
- arch/arm/mach-stm32mp/Makefile                  |  3 +-
- arch/arm/mach-stm32mp/bsec.c                    |  4 +-
- arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 82 ++++++++++++++-----------
- arch/arm/mach-stm32mp/cpu.c                     | 21 +++++++
- arch/arm/mach-stm32mp/include/mach/ddr.h        |  6 +-
- arch/arm/mach-stm32mp/include/mach/stm32.h      |  1 +
- arch/arm/mach-stm32mp/include/mach/sys_proto.h  | 13 +++-
- arch/arm/mach-stm32mp/spl.c                     | 41 ++++++++-----
- arch/arm/mach-stm32mp/stm32mp1_helper_dbg.S     |  5 +-
- 9 files changed, 116 insertions(+), 60 deletions(-)
-
-diff --git a/arch/arm/mach-stm32mp/Makefile b/arch/arm/mach-stm32mp/Makefile
-index 9158a20..13e7773 100644
--- a/arch/arm/mach-stm32mp/Makefile
-+++ b/arch/arm/mach-stm32mp/Makefile
-@@ -6,6 +6,7 @@
- obj-y += cpu.o
- obj-y += dram_init.o
- obj-y += syscon.o
-+obj-y += bsec.o
- 
- ifdef CONFIG_SPL_BUILD
- obj-y += spl.o
-@@ -13,8 +14,6 @@ obj-$(CONFIG_STM32MP1_RESET_HALT_WORKAROUND) += stm32mp1_helper_dbg.o
- else
- obj-$(CONFIG_CMD_STM32PROG) += cmd_stm32prog/
- obj-$(CONFIG_CMD_STM32KEY) += cmd_stm32key.o
-
-obj-y += bsec.o
- obj-$(CONFIG_SYSRESET) += cmd_poweroff.o
- obj-$(CONFIG_ARMV7_PSCI) += psci.o
- endif
-diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
-index 5256378..fa7f39f 100644
--- a/arch/arm/mach-stm32mp/bsec.c
-+++ b/arch/arm/mach-stm32mp/bsec.c
-@@ -436,7 +436,7 @@ static int stm32mp_bsec_ofdata_to_platdata(struct udevice *dev)
- 	return 0;
- }
- 
-#ifndef CONFIG_STM32MP1_TRUSTED
-+#if !defined(CONFIG_STM32MP1_TRUSTED) && !defined(CONFIG_SPL_BUILD)
- static int stm32mp_bsec_probe(struct udevice *dev)
- {
- 	int otp;
-@@ -463,7 +463,7 @@ U_BOOT_DRIVER(stm32mp_bsec) = {
- 	.ofdata_to_platdata = stm32mp_bsec_ofdata_to_platdata,
- 	.platdata_auto_alloc_size = sizeof(struct stm32mp_bsec_platdata),
- 	.ops = &stm32mp_bsec_ops,
-#ifndef CONFIG_STM32MP1_TRUSTED
-+#if !defined(CONFIG_STM32MP1_TRUSTED) && !defined(CONFIG_SPL_BUILD)
- 	.probe = stm32mp_bsec_probe,
- #endif
- };
-diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
-index 8325b56..c6d8f14 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
-+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
-@@ -63,7 +63,7 @@ static const efi_guid_t uuid_mmc[3] = {
- };
- 
- DECLARE_GLOBAL_DATA_PTR;
-#define ENV_BUF_LEN			SZ_1K
-+#define ALT_BUF_LEN			SZ_1K
- 
- /* order of column in flash layout file */
- enum stm32prog_col_t {
-@@ -842,8 +842,8 @@ static int treat_partition_list(struct stm32prog_data *data)
- static int create_partitions(struct stm32prog_data *data)
- {
- 	int offset = 0;
-	char cmdbuf[32];
-	char buf[ENV_BUF_LEN];
-+	const int buflen = SZ_8K;
-+	char *buf;
- 	char uuid[UUID_STR_LEN + 1];
- 	unsigned char *uuid_bin;
- 	unsigned int mmc_id;
-@@ -851,6 +851,10 @@ static int create_partitions(struct stm32prog_data *data)
- 	bool rootfs_found;
- 	struct stm32prog_part_t *part;
- 
-+	buf = malloc(buflen);
-+	if (!buf)
-+		return -ENOMEM;
-+
- 	puts("partitions : ");
- 	/* initialize the selected device */
- 	for (i = 0; i < data->dev_nb; i++) {
-@@ -860,7 +864,7 @@ static int create_partitions(struct stm32prog_data *data)
- 
- 		offset = 0;
- 		rootfs_found = false;
-		memset(buf, 0, sizeof(buf));
-+		memset(buf, 0, buflen);
- 
- 		list_for_each_entry(part, &data->dev[i].part_list, list) {
- 			/* skip eMMC boot partitions */
-@@ -871,7 +875,17 @@ static int create_partitions(struct stm32prog_data *data)
- 			if (part->part_type == RAW_IMAGE)
- 				continue;
- 
-			offset += snprintf(buf + offset, ENV_BUF_LEN - offset,
-+			if (offset + 100 > buflen) {
-+				pr_debug("\n%s: buffer too small, %s skippped",
-+					 __func__, part->name);
-+				continue;
-+			}
-+
-+			if (!offset)
-+				offset += sprintf(buf, "gpt write mmc %d \"",
-+						  data->dev[i].dev_id);
-+
-+			offset += snprintf(buf + offset, buflen - offset,
- 					   "name=%s,start=0x%llx,size=0x%llx",
- 					   part->name,
- 					   part->addr,
-@@ -879,17 +893,17 @@ static int create_partitions(struct stm32prog_data *data)
- 
- 			if (part->part_type == PART_BINARY)
- 				offset += snprintf(buf + offset,
-						   ENV_BUF_LEN - offset,
-+						   buflen - offset,
- 						   ",type="
- 						   LINUX_RESERVED_UUID);
- 			else
- 				offset += snprintf(buf + offset,
-						   ENV_BUF_LEN - offset,
-+						   buflen - offset,
- 						   ",type=linux");
- 
- 			if (part->part_type == PART_SYSTEM)
- 				offset += snprintf(buf + offset,
-						   ENV_BUF_LEN - offset,
-+						   buflen - offset,
- 						   ",bootable");
- 
- 			if (!rootfs_found && !strcmp(part->name, "rootfs")) {
-@@ -901,23 +915,21 @@ static int create_partitions(struct stm32prog_data *data)
- 					uuid_bin_to_str(uuid_bin, uuid,
- 							UUID_STR_FORMAT_GUID);
- 					offset += snprintf(buf + offset,
-							   ENV_BUF_LEN - offset,
-+							   buflen - offset,
- 							   ",uuid=%s", uuid);
- 				}
- 			}
- 
-			offset += snprintf(buf + offset,
-					   ENV_BUF_LEN - offset,
-					   ";");
-+			offset += snprintf(buf + offset, buflen - offset, ";");
- 		}
- 
- 		if (offset) {
-			sprintf(cmdbuf, "gpt write mmc %d \"%s\"",
-				data->dev[i].dev_id, buf);
-			pr_debug("cmd: %s\n", cmdbuf);
-			if (run_command(cmdbuf, 0)) {
-				stm32prog_err("partitionning fail : %s",
-					      cmdbuf);
-+			offset += snprintf(buf + offset, buflen - offset, "\"");
-+			pr_debug("\ncmd: %s\n", buf);
-+			if (run_command(buf, 0)) {
-+				stm32prog_err("partitionning fail : %s", buf);
-+				free(buf);
-+
- 				return -1;
- 			}
- 		}
-@@ -926,21 +938,21 @@ static int create_partitions(struct stm32prog_data *data)
- 			part_init(data->dev[i].block_dev);
- 
- #ifdef DEBUG
-		sprintf(cmdbuf, "gpt verify mmc %d",
-			data->dev[i].dev_id);
-		pr_debug("cmd: %s ", cmdbuf);
-		if (run_command(cmdbuf, 0))
-+		sprintf(buf, "gpt verify mmc %d", data->dev[i].dev_id);
-+		pr_debug("\ncmd: %s", buf);
-+		if (run_command(buf, 0))
- 			printf("fail !\n");
- 		else
- 			printf("OK\n");
- 
- 		/* TEMP : for debug, display partition */
-		sprintf(cmdbuf, "part list mmc %d",
-			data->dev[i].dev_id);
-		run_command(cmdbuf, 0);
-+		sprintf(buf, "part list mmc %d", data->dev[i].dev_id);
-+		run_command(buf, 0);
- #endif
- 	}
- 	puts("done\n");
-+	free(buf);
-+
- 	return 0;
- }
- 
-@@ -952,7 +964,7 @@ static int stm32prog_alt_add(struct stm32prog_data *data,
- 	int offset = 0;
- 	char devstr[4];
- 	char dfustr[10];
-	char buf[ENV_BUF_LEN];
-+	char buf[ALT_BUF_LEN];
- 	u32 size;
- 	char multiplier,  type;
- 
-@@ -973,7 +985,7 @@ static int stm32prog_alt_add(struct stm32prog_data *data,
- 		type = 'a';/*Readable*/
- 
- 	memset(buf, 0, sizeof(buf));
-	offset = snprintf(buf, ENV_BUF_LEN - offset,
-+	offset = snprintf(buf, ALT_BUF_LEN - offset,
- 			  "@%s/0x%02x/1*%d%c%c ",
- 			  part->name, part->id,
- 			  size, multiplier, type);
-@@ -985,29 +997,29 @@ static int stm32prog_alt_add(struct stm32prog_data *data,
- 			dfu_size = part->size / part->dev->lba_blk_size;
- 		else
- 			dfu_size = part->size;
-		offset += snprintf(buf + offset, ENV_BUF_LEN - offset,
-+		offset += snprintf(buf + offset, ALT_BUF_LEN - offset,
- 				   "raw 0x0 0x%llx", dfu_size);
- 	} else if (part->part_id < 0) {
- 		u64 nb_blk = part->size / part->dev->lba_blk_size;
- 
- 		/* lba_blk_size, mmc->read_bl_len */
-		offset += snprintf(buf + offset, ENV_BUF_LEN - offset,
-+		offset += snprintf(buf + offset, ALT_BUF_LEN - offset,
- 				   "raw 0x%llx 0x%llx",
- 				   part->addr, nb_blk);
-		offset += snprintf(buf + offset, ENV_BUF_LEN - offset,
-+		offset += snprintf(buf + offset, ALT_BUF_LEN - offset,
- 				   " mmcpart %d;", -(part->part_id));
- 	} else {
- 		if (part->part_type == PART_SYSTEM &&
- 		    (part->dev_type == DFU_DEV_NAND ||
- 		     part->dev_type == DFU_DEV_SF))
- 			offset += snprintf(buf + offset,
-					   ENV_BUF_LEN - offset,
-+					   ALT_BUF_LEN - offset,
- 					   "partubi");
- 		else
- 			offset += snprintf(buf + offset,
-					   ENV_BUF_LEN - offset,
-+					   ALT_BUF_LEN - offset,
- 					   "part");
-		offset += snprintf(buf + offset, ENV_BUF_LEN - offset,
-+		offset += snprintf(buf + offset, ALT_BUF_LEN - offset,
- 				   " %d %d;",
- 				   part->dev_id,
- 				   part->part_id);
-@@ -1041,7 +1053,7 @@ static int stm32prog_alt_add_virt(struct dfu_entity *dfu,
- {
- 	int ret = 0;
- 	char devstr[4];
-	char buf[ENV_BUF_LEN];
-+	char buf[ALT_BUF_LEN];
- 
- 	sprintf(devstr, "%d", phase);
- 	sprintf(buf, "@%s/0x%02x/1*%dBe", name, phase, size);
-@@ -1100,7 +1112,7 @@ static int dfu_init_entities(struct stm32prog_data *data)
- 			ret = stm32prog_alt_add(data, dfu, part);
- 		}
- 	} else {
-		char buf[ENV_BUF_LEN];
-+		char buf[ALT_BUF_LEN];
- 
- 		sprintf(buf, "@FlashLayout/0x%02x/1*256Ke ram %x 40000",
- 			PHASE_FLASHLAYOUT, STM32_DDR_BASE);
-diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
-index efe8b79..5d43f0b 100644
--- a/arch/arm/mach-stm32mp/cpu.c
-+++ b/arch/arm/mach-stm32mp/cpu.c
-@@ -291,18 +291,36 @@ int print_cpuinfo(void)
- 
- 	/* MPUs Part Numbers */
- 	switch (get_cpu_type()) {
-+	case CPU_STM32MP157Fxx:
-+		cpu_s = "157F";
-+		break;
-+	case CPU_STM32MP157Dxx:
-+		cpu_s = "157D";
-+		break;
- 	case CPU_STM32MP157Cxx:
- 		cpu_s = "157C";
- 		break;
- 	case CPU_STM32MP157Axx:
- 		cpu_s = "157A";
- 		break;
-+	case CPU_STM32MP153Fxx:
-+		cpu_s = "153F";
-+		break;
-+	case CPU_STM32MP153Dxx:
-+		cpu_s = "153D";
-+		break;
- 	case CPU_STM32MP153Cxx:
- 		cpu_s = "153C";
- 		break;
- 	case CPU_STM32MP153Axx:
- 		cpu_s = "153A";
- 		break;
-+	case CPU_STM32MP151Fxx:
-+		cpu_s = "151F";
-+		break;
-+	case CPU_STM32MP151Dxx:
-+		cpu_s = "151D";
-+		break;
- 	case CPU_STM32MP151Cxx:
- 		cpu_s = "151C";
- 		break;
-@@ -341,6 +359,9 @@ int print_cpuinfo(void)
- 	case CPU_REVB:
- 		cpu_r = "B";
- 		break;
-+	case CPU_REVZ:
-+		cpu_r = "Z";
-+		break;
- 	default:
- 		cpu_r = "?";
- 		break;
-diff --git a/arch/arm/mach-stm32mp/include/mach/ddr.h b/arch/arm/mach-stm32mp/include/mach/ddr.h
-index b8a17cf..bfc42a7 100644
--- a/arch/arm/mach-stm32mp/include/mach/ddr.h
-+++ b/arch/arm/mach-stm32mp/include/mach/ddr.h
-@@ -9,8 +9,10 @@
- /* DDR power initializations */
- enum ddr_type {
- 	STM32MP_DDR3,
-	STM32MP_LPDDR2,
-	STM32MP_LPDDR3,
-+	STM32MP_LPDDR2_16,
-+	STM32MP_LPDDR2_32,
-+	STM32MP_LPDDR3_16,
-+	STM32MP_LPDDR3_32,
- };
- 
- int board_ddr_power_init(enum ddr_type ddr_type);
-diff --git a/arch/arm/mach-stm32mp/include/mach/stm32.h b/arch/arm/mach-stm32mp/include/mach/stm32.h
-index 5283e90..70fb235 100644
--- a/arch/arm/mach-stm32mp/include/mach/stm32.h
-+++ b/arch/arm/mach-stm32mp/include/mach/stm32.h
-@@ -96,6 +96,7 @@ enum boot_device {
- #define TAMP_BACKUP_MAGIC_NUMBER	TAMP_BACKUP_REGISTER(4)
- #define TAMP_BACKUP_BRANCH_ADDRESS	TAMP_BACKUP_REGISTER(5)
- /* non secure access */
-+#define TAMP_COPRO_RSC_TBL_ADDRESS	TAMP_BACKUP_REGISTER(17)
- #define TAMP_BOOT_CONTEXT		TAMP_BACKUP_REGISTER(20)
- #define TAMP_BOOTCOUNT			TAMP_BACKUP_REGISTER(21)
- 
-diff --git a/arch/arm/mach-stm32mp/include/mach/sys_proto.h b/arch/arm/mach-stm32mp/include/mach/sys_proto.h
-index 871324b..0ede1e7 100644
--- a/arch/arm/mach-stm32mp/include/mach/sys_proto.h
-+++ b/arch/arm/mach-stm32mp/include/mach/sys_proto.h
-@@ -3,19 +3,26 @@
-  * Copyright (C) 2015-2017, STMicroelectronics - All Rights Reserved
-  */
- 
-/* ID = Device Version (bit31:16) + Device Part Number (RPN) (bit15:0)*/
-+/* ID = Device Version (bit31:16) + Device Part Number (RPN) (bit7:0) */
- #define CPU_STM32MP157Cxx	0x05000000
- #define CPU_STM32MP157Axx	0x05000001
- #define CPU_STM32MP153Cxx	0x05000024
- #define CPU_STM32MP153Axx	0x05000025
- #define CPU_STM32MP151Cxx	0x0500002E
- #define CPU_STM32MP151Axx	0x0500002F
-+#define CPU_STM32MP157Fxx	0x05000080
-+#define CPU_STM32MP157Dxx	0x05000081
-+#define CPU_STM32MP153Fxx	0x050000A4
-+#define CPU_STM32MP153Dxx	0x050000A5
-+#define CPU_STM32MP151Fxx	0x050000AE
-+#define CPU_STM32MP151Dxx	0x050000AF
- 
- /* return CPU_STMP32MP...Xxx constants */
- u32 get_cpu_type(void);
- 
- #define CPU_REVA	0x1000
- #define CPU_REVB	0x2000
-+#define CPU_REVZ	0x2001
- 
- /* return CPU_REV constants */
- u32 get_cpu_rev(void);
-@@ -32,3 +39,7 @@ u32 get_cpu_package(void);
- u32 get_bootmode(void);
- /* start IWDG watchdog */
- int watchdog_start(void);
-+
-+/* board power management : configure vddcore according OPP */
-+void board_vddcore_init(u32 voltage_mv);
-+int board_vddcore_set(void);
-diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
-index 6c8744f..74b56f9 100644
--- a/arch/arm/mach-stm32mp/spl.c
-+++ b/arch/arm/mach-stm32mp/spl.c
-@@ -85,42 +85,49 @@ void spl_display_print(void)
- }
- #endif
- 
-+__weak int board_vddcore_set(void)
-+{
-+	return 0;
-+}
-+
- void board_init_f(ulong dummy)
- {
- 	struct udevice *dev;
-	int ret;
-+	int ret, clk, reset, pinctrl, power;
- 
- 	arch_cpu_init();
- 
- 	ret = spl_early_init();
- 	if (ret) {
-		debug("spl_early_init() failed: %d\n", ret);
-+		debug("%s: spl_early_init() failed: %d\n", __func__, ret);
- 		hang();
- 	}
- 
-	ret = uclass_get_device(UCLASS_CLK, 0, &dev);
-	if (ret) {
-		debug("Clock init failed: %d\n", ret);
-		return;
-	}
-+	clk = uclass_get_device(UCLASS_CLK, 0, &dev);
-+	if (clk)
-+		debug("%s: Clock init failed: %d\n", __func__, clk);
- 
-	ret = uclass_get_device(UCLASS_RESET, 0, &dev);
-	if (ret) {
-		debug("Reset init failed: %d\n", ret);
-		return;
-	}
-+	reset = uclass_get_device(UCLASS_RESET, 0, &dev);
-+	if (reset)
-+		debug("%s: Reset init failed: %d\n", __func__, reset);
- 
-	ret = uclass_get_device(UCLASS_PINCTRL, 0, &dev);
-	if (ret) {
-		debug("%s: Cannot find pinctrl device\n", __func__);
-		return;
-	}
-+	pinctrl = uclass_get_device(UCLASS_PINCTRL, 0, &dev);
-+	if (pinctrl)
-+		debug("%s: Cannot find pinctrl device: %d\n",
-+		      __func__, pinctrl);
- 
- 	/* enable console uart printing */
- 	preloader_console_init();
- 
- 	watchdog_start();
- 
-+	/* change vddcore if needed after clock tree init */
-+	power = board_vddcore_set();
-+
-+	if (clk || reset || pinctrl || power)
-+		printf("%s: probe failed clk=%d reset=%d pinctrl=%d power=%d\n",
-+		       __func__, clk, reset, pinctrl, power);
-+
- 	ret = uclass_get_device(UCLASS_RAM, 0, &dev);
- 	if (ret) {
- 		printf("DRAM init failed: %d\n", ret);
-diff --git a/arch/arm/mach-stm32mp/stm32mp1_helper_dbg.S b/arch/arm/mach-stm32mp/stm32mp1_helper_dbg.S
-index 37a1b06..d17a37a 100644
--- a/arch/arm/mach-stm32mp/stm32mp1_helper_dbg.S
-+++ b/arch/arm/mach-stm32mp/stm32mp1_helper_dbg.S
-@@ -10,6 +10,9 @@
-  * fixes the limitation. Anyway, this source code identifies the Soc revision
-  * and is only executed if it corresponds, so it can be kept on other
-  * revisions without any consequence.
-+ * The revisions that need the workaround have ID values:
-+ * - 0x2000X500
-+ * - 0x2001X500
-  ****************************************************************************/
- 
- #include <linux/linkage.h>
-@@ -30,7 +33,7 @@
- #define PWR_CR1_DBP			BIT(8)
- 
- #define DBGMCU_IDC_ADDR			0x50081000
-#define DBGMCU_IDC_MASK			0xFFFF0FFF
-+#define DBGMCU_IDC_MASK			0xFFFE0FFF
- #define DBGMCU_IDC_VALUE		0x20000500
- 
- #define TAMP_BKP_REGISTER_20		(0x5C00A100 + (20 << 2))
-- 
-2.7.4
-
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0015-ARM-v2018.11-stm32mp-r4-BOARD.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0015-ARM-v2018.11-stm32mp-r4-BOARD.patch
@ -1,255 +0,0 @@
-From 74c58d9ed7af723b31a4f9d3725afcce9fde1ca4 Mon Sep 17 00:00:00 2001
-From: Romuald JEANNE <romuald.jeanne@st.com>
-Date: Thu, 30 Jan 2020 14:56:24 +0100
-Subject: [PATCH 15/17] ARM v2018.11 stm32mp r4 BOARD
-
---
- board/st/stm32mp1/Kconfig    |  4 ++++
- board/st/stm32mp1/README     | 21 ++++++++++++++--
- board/st/stm32mp1/board.c    | 57 ++++++++++++++++++++++++++++++++++++++++----
- board/st/stm32mp1/stm32mp1.c | 36 +++++++++++++---------------
- 4 files changed, 92 insertions(+), 26 deletions(-)
-
-diff --git a/board/st/stm32mp1/Kconfig b/board/st/stm32mp1/Kconfig
-index 92d8f90..6a06e5b 100644
--- a/board/st/stm32mp1/Kconfig
-+++ b/board/st/stm32mp1/Kconfig
-@@ -16,4 +16,8 @@ config CMD_STBOARD
- 	  This compile the stboard command to
- 	  read and write the board in the OTP.
- 
-+config TARGET_STM32MP157C_DK2
-+	bool "support of STMicroelectronics STM32MP157C-DK2 Discovery Board"
-+	default y
-+
- endif
-diff --git a/board/st/stm32mp1/README b/board/st/stm32mp1/README
-index b710602..782b9d18 100644
--- a/board/st/stm32mp1/README
-+++ b/board/st/stm32mp1/README
-@@ -305,7 +305,20 @@ Mac id storage and retrieval in stm32mp otp :
- To program a MAC address on virgin OTP words above, you can use the fuse command
- on bank 0 to access to internal OTP:
- 
-    example to set mac address "12:34:56:78:9a:bc"
-+    Prerequisite: check if a MAC address isn't yet programmed in OTP
-+
-+    1- check OTP: their value must be equal to 0
-+
-+       STM32MP> fuse sense 0 57 2
-+       Sensing bank 0:
-+       Word 0x00000039: 00000000 00000000
-+
-+    2- check environment variable
-+
-+       STM32MP> env print ethaddr
-+       ## Error: "ethaddr" not defined
-+
-+    Example to set mac address "12:34:56:78:9a:bc"
- 
-     1- Write OTP
-        STM32MP> fuse prog -y 0 57 0x78563412 0x0000bc9a
-@@ -319,9 +332,13 @@ on bank 0 to access to internal OTP:
-        ### Setting environment from OTP MAC address = "12:34:56:78:9a:bc"
- 
-     4 check env update
-       STM32MP> print ethaddr
-+       STM32MP> env print ethaddr
-        ethaddr=12:34:56:78:9a:bc
- 
-+warning:: This MAC address provisioning can't be executed twice on the same
-+          board as the OTP are protected. It is already done for the board
-+          provided by STMicroelectronics.
-+
- 10. Coprocessor firmware
- ========================
- 
-diff --git a/board/st/stm32mp1/board.c b/board/st/stm32mp1/board.c
-index c3d832f..3e38aef 100644
--- a/board/st/stm32mp1/board.c
-+++ b/board/st/stm32mp1/board.c
-@@ -38,11 +38,46 @@ void board_debug_uart_init(void)
- #endif
- 
- #ifdef CONFIG_PMIC_STPMIC1
-+u32 opp_voltage_mv;
-+
-+void board_vddcore_init(u32 voltage_mv)
-+{
-+	opp_voltage_mv = voltage_mv;
-+}
-+
-+int board_vddcore_set(void)
-+{
-+	struct udevice *dev;
-+	int ret;
-+	u32 value;
-+
-+	if (!opp_voltage_mv)
-+		return 0;
-+
-+	ret = uclass_get_device_by_driver(UCLASS_PMIC,
-+					  DM_GET_DRIVER(pmic_stpmic1), &dev);
-+	if (ret)
-+		return ret;
-+
-+	/* VDDCORE= STMPCI1 BUCK1 ramp=+25mV, 5 => 725mV, 36 => 1500mV */
-+	value = ((opp_voltage_mv - 725) / 25) + 5;
-+	if (value < 5)
-+		value = 5;
-+	if (value > 36)
-+		value = 36;
-+
-+	return pmic_clrsetbits(dev,
-+			       STPMIC1_BUCKX_MAIN_CR(STPMIC1_BUCK1),
-+			       STPMIC1_BUCK_VOUT_MASK,
-+			       STPMIC1_BUCK_VOUT(value));
-+}
-+
- int board_ddr_power_init(enum ddr_type ddr_type)
- {
- 	struct udevice *dev;
- 	bool buck3_at_1800000v = false;
- 	int ret;
-+	u32 buck2;
- 
- 	ret = uclass_get_device_by_driver(UCLASS_PMIC,
- 					  DM_GET_DRIVER(pmic_stpmic1), &dev);
-@@ -102,8 +137,10 @@ int board_ddr_power_init(enum ddr_type ddr_type)
- 
- 		break;
- 
-	case STM32MP_LPDDR2:
-	case STM32MP_LPDDR3:
-+	case STM32MP_LPDDR2_16:
-+	case STM32MP_LPDDR2_32:
-+	case STM32MP_LPDDR3_16:
-+	case STM32MP_LPDDR3_32:
- 		/*
- 		 * configure VDD_DDR1 = LDO3
- 		 * Set LDO3 to 1.8V
-@@ -133,11 +170,23 @@ int board_ddr_power_init(enum ddr_type ddr_type)
- 		if (ret < 0)
- 			return ret;
- 
-		/* VDD_DDR2 : Set BUCK2 to 1.2V */
-+		/* VDD_DDR2 : Set BUCK2 to 1.2V (16bits) or 1.25V (32 bits)*/
-+		switch (ddr_type) {
-+		case STM32MP_LPDDR2_32:
-+		case STM32MP_LPDDR3_32:
-+			buck2 = STPMIC1_BUCK2_1250000V;
-+			break;
-+		default:
-+		case STM32MP_LPDDR2_16:
-+		case STM32MP_LPDDR3_16:
-+			buck2 = STPMIC1_BUCK2_1200000V;
-+			break;
-+		}
-+
- 		ret = pmic_clrsetbits(dev,
- 				      STPMIC1_BUCKX_MAIN_CR(STPMIC1_BUCK2),
- 				      STPMIC1_BUCK_VOUT_MASK,
-				      STPMIC1_BUCK2_1200000V);
-+				      buck2);
- 		if (ret < 0)
- 			return ret;
- 
-diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
-index f852b1e..822b6d7 100644
--- a/board/st/stm32mp1/stm32mp1.c
-+++ b/board/st/stm32mp1/stm32mp1.c
-@@ -388,10 +388,15 @@ int g_dnl_board_usb_cable_connected(void)
- }
- 
- #define STM32MP1_G_DNL_DFU_PRODUCT_NUM 0xdf11
-+#define STM32MP1_G_DNL_FASTBOOT_PRODUCT_NUM 0x0afb
-+
- int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
- {
- 	if (!strcmp(name, "usb_dnl_dfu"))
- 		put_unaligned(STM32MP1_G_DNL_DFU_PRODUCT_NUM, &dev->idProduct);
-+	else if (!strcmp(name, "usb_dnl_fastboot"))
-+		put_unaligned(STM32MP1_G_DNL_FASTBOOT_PRODUCT_NUM,
-+			      &dev->idProduct);
- 	else
- 		put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM, &dev->idProduct);
- 
-@@ -517,6 +522,7 @@ static void __maybe_unused led_error_blink(u32 nb_blink)
- 			mdelay(125);
- 			WATCHDOG_RESET();
- 		}
-+		led_set_state(led, LEDST_ON);
- 	}
- #endif
- 
-@@ -876,7 +882,8 @@ const char *env_ext4_get_dev_part(void)
- 
- static __maybe_unused bool board_is_dk2(void)
- {
-	if (of_machine_is_compatible("st,stm32mp157c-dk2"))
-+	if (CONFIG_IS_ENABLED(TARGET_STM32MP157C_DK2) &&
-+	    of_machine_is_compatible("st,stm32mp157c-dk2"))
- 		return true;
- 
- 	return false;
-@@ -1079,9 +1086,7 @@ void board_mtdparts_default(const char **mtdids, const char **mtdparts)
- #if defined(CONFIG_OF_BOARD_SETUP)
- int ft_board_setup(void *blob, bd_t *bd)
- {
-	ulong copro_rsc_addr, copro_rsc_size;
- 	int off;
-	char *s_copro = NULL;
- #ifdef CONFIG_FDT_FIXUP_PARTITIONS
- 	struct node_info nodes[] = {
- 		{ "st,stm32f469-qspi",		MTD_DEV_TYPE_NOR,  },
-@@ -1093,20 +1098,11 @@ int ft_board_setup(void *blob, bd_t *bd)
- 	/* Update DT if coprocessor started */
- 	off = fdt_path_offset(blob, "/m4");
- 	if (off > 0) {
-		s_copro = env_get("copro_state");
-		copro_rsc_addr  = env_get_hex("copro_rsc_addr", 0);
-		copro_rsc_size  = env_get_hex("copro_rsc_size", 0);
-
-		if (s_copro) {
-+		if (env_get("copro_state")) {
- 			fdt_setprop_empty(blob, off, "early-booted");
-			if (copro_rsc_addr)
-				fdt_setprop_u32(blob, off, "rsc-address",
-						copro_rsc_addr);
-			if (copro_rsc_size)
-				fdt_setprop_u32(blob, off, "rsc-size",
-						copro_rsc_size);
- 		} else {
- 			fdt_delprop(blob, off, "early-booted");
-+			writel(0, TAMP_COPRO_RSC_TBL_ADDRESS);
- 		}
- 	}
- 
-@@ -1128,18 +1124,18 @@ static void board_stm32copro_image_process(ulong fw_image, size_t fw_size)
- 		}
- 
- 	ret = rproc_load_rsc_table(id, fw_image, fw_size, &rsc_addr, &rsc_size);
-	if (!ret) {
-		env_set_hex("copro_rsc_addr", rsc_addr);
-		env_set_hex("copro_rsc_size", rsc_size);
-	}
-+	if (ret && ret != -ENODATA)
-+		return;
- 
- 	ret = rproc_load(id, fw_image, fw_size);
- 	printf("Load Remote Processor %d with data@addr=0x%08lx %u bytes:%s\n",
- 	       id, fw_image, fw_size, ret ? " Failed!" : " Success!");
- 
- 	if (!ret) {
-		rproc_start(id);
-		env_set("copro_state", "booted");
-+		ret = rproc_start(id);
-+		printf("Start firmware:%s\n", ret ? " Failed!" : " Success!");
-+		if (!ret)
-+			env_set("copro_state", "booted");
- 	}
- }
- 
-- 
-2.7.4
-
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0016-ARM-v2018.11-stm32mp-r4-DEVICETREE.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0016-ARM-v2018.11-stm32mp-r4-DEVICETREE.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0017-ARM-v2018.11-stm32mp-r4-MISC.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0017-ARM-v2018.11-stm32mp-r4-MISC.patch
--- a/recipes-bsp/u-boot/u-boot-stm32mp/0099-Add-external-var-to-allow-build-of-new-devicetree-fi.patch
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/0099-Add-external-var-to-allow-build-of-new-devicetree-fi.patch
@ -0,0 +1,29 @@
+From 641d3282b8df04bf1a23c9ded96d01e2381d4e38 Mon Sep 17 00:00:00 2001
+From: Romuald JEANNE <romuald.jeanne@st.com>
+Date: Tue, 26 May 2020 15:03:11 +0200
+Subject: [PATCH] Add external var to allow build of new devicetree file
+
+Signed-off-by: Romuald JEANNE <romuald.jeanne@st.com>
+---
+ arch/arm/dts/Makefile | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
+index 29eb949..718e454 100644
+--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
+@@ -1,5 +1,11 @@
+ # SPDX-License-Identifier: GPL-2.0+
+ 
+DEVICE_TREE_EXT ?=
+
+ifneq ($(DEVICE_TREE_EXT),)
+dtb-y += $(DEVICE_TREE_EXT)
+endif
+
+ dtb-$(CONFIG_TARGET_SMARTWEB) += at91sam9260-smartweb.dtb
+ dtb-$(CONFIG_TARGET_TAURUS) += at91sam9g20-taurus.dtb
+ dtb-$(CONFIG_TARGET_CORVUS) += at91sam9g45-corvus.dtb
+-- 
+2.7.4
+
--- a/recipes-bsp/u-boot/u-boot-stm32mp/README.HOW_TO.txt
+++ b/recipes-bsp/u-boot/u-boot-stm32mp/README.HOW_TO.txt
@ -19,17 +19,17 @@ For U-Boot build you need to install:
    - Fedora: sudo yum install git

 If you have never configured you git configuration:
-    $> git config --global user.name "your_name"
-    $> git config --global user.email "your_email@example.com"
+    $ git config --global user.name "your_name"
+    $ git config --global user.email "your_email@example.com"

 2. Initialize cross-compilation via SDK:
 ---------------------------------------
 * Source SDK environment:
-    $> source <path to SDK>/environment-setup-cortexa7t2hf-neon-vfpv4-openstlinux_weston-linux-gnueabi
+    $ source <path to SDK>/environment-setup-cortexa7t2hf-neon-vfpv4-ostl-linux-gnueabi

 * To verify if you cross-compilation environment are put in place:
-    $> set | grep CROSS
-    CROSS_COMPILE=arm-openstlinux_weston-linux-gnueabi-
+    $ set | grep CROSS
+    CROSS_COMPILE=arm-ostl-linux-gnueabi-

 Warning: the environment are valid only on the shell session where you have
         sourced the sdk environment.
@ -38,11 +38,11 @@ Warning: the environment are valid only on the shell session where you have
 ------------------------

 Extract the sources from tarball, for example:
-$> tar xfJ SOURCES-st-image-weston-openstlinux-weston-stm32mp1-*.tar.xz
+$ tar xfJ SOURCES-st-image-weston-openstlinux-weston-stm32mp1-*.tar.xz

-In the U-Boot source directory (sources/*/u-boot-stm32mp-2018.11-r0),
+In the U-Boot source directory (sources/*/##BP##-##PR##),
 you have one U-Boot source tarball, the patches and one Makefile:
-   - v2018.11.tar.gz
+   - ##BP##-##PR##.tar.gz
   - 000*.patch
   - Makefile.sdk

@ -51,8 +51,8 @@ NB: if you would like to have a git management on the code see

 Then you must extract the tarball and apply the patch:

-    $> tar xfz v2018.11.tar.gz
-    $> cd u-boot-2018.11
+    $> tar xfz ##BP##-##PR##.tar.gz
+    $> cd ##BP##
    $> for p in `ls -1 ../*.patch`; do patch -p1 < $p; done

 4. Management of U-Boot source code with GIT
@ -63,57 +63,57 @@ you have 3 solutions to use git
 4.1 Get STMicroelectronics U-Boot source from GitHub

    URL: https://github.com/STMicroelectronics/u-boot.git
-    Branch: v2018.11-stm32mp
-    Revision: v2018.11-stm32mp-r2
+    Branch: v##PV##-stm32mp
+    Revision: v##PV##-stm32mp-##PR##

-    $> git clone https://github.com/STMicroelectronics/u-boot.git
-    $> git checkout -b WORKING v2018.11-stm32mp-r2
+    $ git clone https://github.com/STMicroelectronics/u-boot.git
+    $ git checkout -b WORKING v##PV##-stm32mp-##PR##

 4.2 Create Git from tarball

-    $> tar xvf v2018.11.tar.gz
-    $> cd u-boot-2018.11
-    $> test -d .git || git init . && git add . && git commit -m "U-Boot source code" && git gc
-    $> git checkout -b WORKING
-    $> for p in `ls -1 ../*.patch`; do git am $p; done
+    $ tar xfz ##BP##-##PR##.tar.gz
+    $ cd ##BP##
+    $ test -d .git || git init . && git add . && git commit -m "U-Boot source code" && git gc
+    $ git checkout -b WORKING
+    $ for p in `ls -1 ../*.patch`; do git am $p; done

 4.3 Get Git from community and apply STMicroelectronics patches

    URL: git://git.denx.de/u-boot.git
    Branch: master
-    Revision: v2018.11
+    Revision: v##PV##

-    $> git clone git://git.denx.de/u-boot.git
+    $ git clone git://git.denx.de/u-boot.git
 or
-    $> git clone http://git.denx.de/u-boot.git
+    $ git clone http://git.denx.de/u-boot.git

-    $> cd u-boot
-    $> git checkout -b WORKING v2018.11
-    $> for p in `ls -1 ../*.patch`; do git am $p; done
+    $ cd u-boot
+    $ git checkout -b WORKING v##PV##
+    $ for p in `ls -1 ../*.patch`; do git am $p; done

 5. Compilation U-Boot source code:
 ----------------------------------
 To compile U-Boot source code, first move to U-Boot source:
-    $> cd u-boot-2018.11
+    $ cd ##BP##
    or
-    $> cd u-boot
+    $ cd u-boot

 5.1 Compilation for one target (one defconfig, one device tree)

    see <U-Boot source>/board/st/stm32mp1/README for details

-    # make stm32mp15_<config>_defconfig
-    # make DEVICE_TREE=<device tree> all
+    $ make stm32mp15_<config>_defconfig
+    $ make DEVICE_TREE=<device tree> all

    example:

    a) trusted boot on ev1
-	# make stm32mp15_trusted_defconfig
-	# make DEVICE_TREE=stm32mp157c-ev1 all
+	$ make stm32mp15_trusted_defconfig
+	$ make DEVICE_TREE=stm32mp157c-ev1 all

    b) basic boot on dk2
-	# make stm32mp15_basic_defconfig
-	# make DEVICE_TREE=stm32mp157c-dk2 all
+	$ make stm32mp15_basic_defconfig
+	$ make DEVICE_TREE=stm32mp157c-dk2 all

 5.2 Compilation for several targets: use Makefile.sdk

@ -135,36 +135,21 @@ variables 'DEVICE_TREE' and 'UBOOT_CONFIGS':

 The generated binary files are available in ../build-${config}.

-by default we define 3 configs: basic, trusted, optee
-for the 4 board : stm32mp157a-dk1 stm32mp157c-dk2 stm32mp157c-ed1 stm32mp157c-ev1
-
+by default we define 3 configs: basic, trusted, optee for the several boards
 The generated files are :
-
-../build-trusted
-	u-boot-stm32mp157a-dk1-trusted.stm32
-	u-boot-stm32mp157c-dk2-trusted.stm32
-	u-boot-stm32mp157c-ed1-trusted.stm32
-	u-boot-stm32mp157c-ev1-trusted.stm32
-
-../build-optee
-	u-boot-stm32mp157a-dk1-optee.stm32
-	u-boot-stm32mp157c-dk2-optee.stm32
-	u-boot-stm32mp157c-ed1-optee.stm32
-	u-boot-stm32mp157c-ev1-optee.stm32
-
-../build-basic
-	u-boot-stm32mp157a-dk1-basic.img & u-boot-spl.stm32-stm32mp157a-dk1-basic
-	u-boot-stm32mp157c-dk2-basic.img & u-boot-spl.stm32-stm32mp157c-dk2-basic
-	u-boot-stm32mp157c-ed1-basic.img & u-boot-spl.stm32-stm32mp157c-ed1-basic
-	u-boot-stm32mp157c-ev1-basic.img & u-boot-spl.stm32-stm32mp157c-ev1-basic
+  for trusted and optee configs:
+    #> ../build-{trusted,optee}/*.stm32
+  for basic config
+    #> ../build-basic/u-boot-spl.elf-*-basic
+    #> ../build-basic/u-boot-*-basic.img

 You can override the default U-Boot configuration if you specify these variables:
  - Compile default U-Boot configuration but applying specific devicetree(s):
-    $> make -f $PWD/../Makefile.sdk all DEVICE_TREE="<devicetree1> <devicetree2>"
+    $ make -f $PWD/../Makefile.sdk all DEVICE_TREE="<devicetree1> <devicetree2>"
  - Compile for a specific U-Boot configuration:
-    $> make -f $PWD/../Makefile.sdk all UBOOT_CONFIGS=<u-boot defconfig>,<u-boot type>,<u-boot binary>
+    $ make -f $PWD/../Makefile.sdk all UBOOT_CONFIGS=<u-boot defconfig>,<u-boot type>,<u-boot binary>
  - Compile for a specific U-Boot configuration and applying specific devicetree(s):
-    $> make -f $PWD/../Makefile.sdk all UBOOT_CONFIGS=<u-boot defconfig>,<u-boot type>,<u-boot binary> DEVICE_TREE="<devicetree1> <devicetree2>"
+    $ make -f $PWD/../Makefile.sdk all UBOOT_CONFIGS=<u-boot defconfig>,<u-boot type>,<u-boot binary> DEVICE_TREE="<devicetree1> <devicetree2>"

 6. Update software on board:
 ----------------------------
@ -203,14 +188,14 @@ U-boot binary (u-boot*.stm32) MUST be copied on a dedicated partition named "ssb
  "fsbl1" is the partition 1:
  - SDCARD: /dev/mmcblkXp1 (where X is the instance number)
  - SDCARD via USB reader: /dev/sdX1 (where X is the instance number)
-  dd if=<U-Boot SPL file> of=/dev/<device partition> bs=1M conv=fdatasync
+  $ dd if=<U-Boot SPL file> of=/dev/<device partition> bs=1M conv=fdatasync

 * u-boot*.img
  Copy the binary on the dedicated partition, on SDCARD/USB disk the partition
  "ssbl" is the partition 4:
  - SDCARD: /dev/mmcblkXp3 (where X is the instance number)
  - SDCARD via USB reader: /dev/sdX3 (where X is the instance number)
-  dd if=<U-Boot image file> of=/dev/<device partition> bs=1M conv=fdatasync
+  $ dd if=<U-Boot image file> of=/dev/<device partition> bs=1M conv=fdatasync

 6.2.2. Trusted boot chain
 * tf-a-*.stm32
@ -218,19 +203,19 @@ U-boot binary (u-boot*.stm32) MUST be copied on a dedicated partition named "ssb
  "fsbl1" is the partition 1:
  - SDCARD: /dev/mmcblkXp1 (where X is the instance number)
  - SDCARD via USB reader: /dev/sdX1 (where X is the instance number)
-  dd if=<TF-A binary file> of=/dev/<device partition> bs=1M conv=fdatasync
+  $ dd if=<TF-A binary file> of=/dev/<device partition> bs=1M conv=fdatasync

 * u-boot*.stm32
  Copy the binary on the dedicated partition, on SDCARD/USB disk the partition
  "ssbl" is the partition 4:
  - SDCARD: /dev/mmcblkXp3 (where X is the instance number)
  - SDCARD via USB reader: /dev/sdX3 (where X is the instance number)
-  dd if=<U-Boot stm32 binary file> of=/dev/<device partition> bs=1M conv=fdatasync
+  $ dd if=<U-Boot stm32 binary file> of=/dev/<device partition> bs=1M conv=fdatasync

 6.2.3. FAQ
 to found the partition associated to a specific label, just plug the
 SDCARD/USB disk on your PC and call the following command:
-  $> ls -l /dev/disk/by-partlabel/
+  $ ls -l /dev/disk/by-partlabel/
 total 0
 lrwxrwxrwx 1 root root 10 Jan 17 17:38 bootfs -> ../../mmcblk0p4
 lrwxrwxrwx 1 root root 10 Jan 17 17:38 fsbl1 -> ../../mmcblk0p1     ➔ FSBL (TF-A)
--- a/recipes-bsp/u-boot/u-boot-stm32mp_2020.01.bb
+++ b/recipes-bsp/u-boot/u-boot-stm32mp_2020.01.bb
@ -4,6 +4,9 @@ require u-boot-stm32mp.inc
 SUMMARY = "Universal Boot Loader for embedded devices for stm32mp"
 LICENSE = "GPLv2+"

+PROVIDES += "u-boot"
+RPROVIDES_${PN} += "u-boot"
+
 # ---------------------------------
 # Configure archiver use
 # ---------------------------------