From 2daf76073d1080091520dcf391aa9dfc6bc06a10 Mon Sep 17 00:00:00 2001
From: Andrey Zhizhikin <andrey.z@gmail.com>
Date: Tue, 5 Apr 2022 19:13:14 +0000
Subject: u-boot-fslc: upgrade to v2022.04+fslc

U-Boot fork has been updated to include new version v2022.04 from
upstream.

Following commits were ported from 2022.01+fslc revision:
----
f885198273 imx: iMX6: Define disconnect_from_pc function
1667c942d0 MLK-21854-2 imx: uuu: Update autoboot to run uuu or fastboot
c7805ae3cf pico-imx6ul, pico-imx7d: Explain how to use eMMC user partition
92268e6c2a mx6sabre_common: Dynamically change the video output
f66f12923e mx6sabresd: Enable video interfaces in bootargs
----

Update U-Boot recipe versions and point to new revision.

Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
---
 recipes-bsp/u-boot/u-boot-fslc-common_2022.01.inc | 19 --------------
 recipes-bsp/u-boot/u-boot-fslc-common_2022.04.inc | 19 ++++++++++++++
 recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.01.bb |  8 ------
 recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.04.bb |  8 ++++++
 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb | 32 -----------------------
 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.04.bb | 32 +++++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-fslc_2022.01.bb         | 31 ----------------------
 recipes-bsp/u-boot/u-boot-fslc_2022.04.bb         | 31 ++++++++++++++++++++++
 8 files changed, 90 insertions(+), 90 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2022.01.inc
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2022.04.inc
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.01.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.04.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.04.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2022.01.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2022.04.bb

diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2022.01.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2022.01.inc
deleted file mode 100644
index 43478516e..000000000
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2022.01.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2012-2019 O.S. Systems Software LTDA.
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-inherit fsl-u-boot-localversion
-
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
-
-DEPENDS += "flex-native bison-native"
-
-SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
-
-SRCREV = "ed9503daa309c765a8654dc89c486326b4850f6d"
-SRCBRANCH = "2022.01+fslc"
-
-PV = "v2022.01+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2022.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2022.04.inc
new file mode 100644
index 000000000..0fad0367f
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2022.04.inc
@@ -0,0 +1,19 @@
+# Copyright (C) 2012-2019 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+inherit fsl-u-boot-localversion
+
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
+
+DEPENDS += "flex-native bison-native"
+
+SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
+
+SRCREV = "f88519827335b548fcd276acda32107f5120276f"
+SRCBRANCH = "2022.04+fslc"
+
+PV = "v2022.04+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.01.bb
deleted file mode 100644
index 2e79166b2..000000000
--- a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.01.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) 2014 O.S. Systems Software LTDA.
-# Copyright (C) 2014-2016 Freescale Semiconductor
-# Copyright 2017-2019 NXP
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-fslc:"
-
-require u-boot-fslc_${PV}.bb
-require u-boot-mfgtool.inc
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.04.bb
new file mode 100644
index 000000000..2e79166b2
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.04.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2014 O.S. Systems Software LTDA.
+# Copyright (C) 2014-2016 Freescale Semiconductor
+# Copyright 2017-2019 NXP
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-fslc:"
+
+require u-boot-fslc_${PV}.bb
+require u-boot-mfgtool.inc
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb
deleted file mode 100644
index 0a0a1d9c4..000000000
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-require u-boot-fslc-common_${PV}.inc
-
-DESCRIPTION = "U-boot bootloader mxsboot tool"
-SECTION = "bootloader"
-
-DEPENDS = "bison-native dtc openssl"
-
-PROVIDES = "u-boot-mxsboot"
-
-EXTRA_OEMAKE:class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y'
-EXTRA_OEMAKE:class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y'
-EXTRA_OEMAKE:class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y'
-
-do_compile () {
-    oe_runmake -C ${S} O=${B} sandbox_defconfig
-
-    # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and
-    # generating it requires bin2header tool, which for target build
-    # is built with target tools and thus cannot be executed on host.
-    sed -i "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" .config
-
-    oe_runmake -C ${S} O=${B} cross_tools NO_SDL=1
-}
-
-do_install () {
-    install -Dm 0755 tools/mxsboot ${D}${bindir}/uboot-mxsboot
-    ln -sf uboot-mxsboot ${D}${bindir}/mxsboot
-}
-
-COMPATIBLE_MACHINE:class-target = "(mxs-generic-bsp)"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.04.bb
new file mode 100644
index 000000000..0a0a1d9c4
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.04.bb
@@ -0,0 +1,32 @@
+require u-boot-fslc-common_${PV}.inc
+
+DESCRIPTION = "U-boot bootloader mxsboot tool"
+SECTION = "bootloader"
+
+DEPENDS = "bison-native dtc openssl"
+
+PROVIDES = "u-boot-mxsboot"
+
+EXTRA_OEMAKE:class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y'
+EXTRA_OEMAKE:class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y'
+EXTRA_OEMAKE:class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y'
+
+do_compile () {
+    oe_runmake -C ${S} O=${B} sandbox_defconfig
+
+    # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and
+    # generating it requires bin2header tool, which for target build
+    # is built with target tools and thus cannot be executed on host.
+    sed -i "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" .config
+
+    oe_runmake -C ${S} O=${B} cross_tools NO_SDL=1
+}
+
+do_install () {
+    install -Dm 0755 tools/mxsboot ${D}${bindir}/uboot-mxsboot
+    ln -sf uboot-mxsboot ${D}${bindir}/mxsboot
+}
+
+COMPATIBLE_MACHINE:class-target = "(mxs-generic-bsp)"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb
deleted file mode 100644
index ec5298b67..000000000
--- a/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-require u-boot-fslc-common_${PV}.inc
-
-DESCRIPTION = "U-Boot based on mainline U-Boot used by FSL Community BSP in \
-order to provide support for some backported features and fixes, or because it \
-was submitted for revision and it takes some time to become part of a stable \
-version, or because it is not applicable for upstreaming."
-
-inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')}
-
-DEPENDS += "bc-native dtc-native python3-setuptools-native lzop-native"
-
-# Location known to imx-boot component, where U-Boot artifacts
-# should be additionally deployed.
-# See below note above do_deploy:append:mx8m-nxp-bsp for the purpose of
-# this delopyment location
-BOOT_TOOLS = "imx-boot-tools"
-
-PROVIDES += "u-boot"
-
-B = "${WORKDIR}/build"
-
-# FIXME: Allow linking of 'tools' binaries with native libraries
-#        used for generating the boot logo and other tools used
-#        during the build process.
-EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
-                 HOSTLDFLAGS="${BUILD_LDFLAGS}" \
-                 HOSTSTRIP=true'
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2022.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2022.04.bb
new file mode 100644
index 000000000..ec5298b67
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc_2022.04.bb
@@ -0,0 +1,31 @@
+require recipes-bsp/u-boot/u-boot.inc
+require u-boot-fslc-common_${PV}.inc
+
+DESCRIPTION = "U-Boot based on mainline U-Boot used by FSL Community BSP in \
+order to provide support for some backported features and fixes, or because it \
+was submitted for revision and it takes some time to become part of a stable \
+version, or because it is not applicable for upstreaming."
+
+inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')}
+
+DEPENDS += "bc-native dtc-native python3-setuptools-native lzop-native"
+
+# Location known to imx-boot component, where U-Boot artifacts
+# should be additionally deployed.
+# See below note above do_deploy:append:mx8m-nxp-bsp for the purpose of
+# this delopyment location
+BOOT_TOOLS = "imx-boot-tools"
+
+PROVIDES += "u-boot"
+
+B = "${WORKDIR}/build"
+
+# FIXME: Allow linking of 'tools' binaries with native libraries
+#        used for generating the boot logo and other tools used
+#        during the build process.
+EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
+                 HOSTLDFLAGS="${BUILD_LDFLAGS}" \
+                 HOSTSTRIP=true'
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"
-- 
cgit v1.2.3-54-g00ecf