From 9de18351e0fd42b949b8cc55c74883162e42e6a4 Mon Sep 17 00:00:00 2001
From: Peter Bergin <peter@berginkonsult.se>
Date: Sun, 4 Jul 2021 16:18:09 +0200
Subject: u-boot-imx: upgrade to 2021.04

Use the latest released version of u-boot-imx from NXP's release.

For a full log of changes run this command in the repo uboot-imx:
  $ git log 185bdaaaf5644319284566e5c340927d28954a1a..3463140881c523e248d2fcb6bfc9ed25c0db93bd

Signed-off-by: Peter Bergin <peter@berginkonsult.se>
---
 recipes-bsp/u-boot/u-boot-imx-common_2020.04.inc | 20 ---------------
 recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc | 20 +++++++++++++++
 recipes-bsp/u-boot/u-boot-imx-mfgtool_2020.04.bb |  8 ------
 recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb |  8 ++++++
 recipes-bsp/u-boot/u-boot-imx_2020.04.bb         | 32 ------------------------
 recipes-bsp/u-boot/u-boot-imx_2021.04.bb         | 32 ++++++++++++++++++++++++
 6 files changed, 60 insertions(+), 60 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx-common_2020.04.inc
 create mode 100644 recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx-mfgtool_2020.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx_2020.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-imx_2021.04.bb

diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2020.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2020.04.inc
deleted file mode 100644
index f1edc92c..00000000
--- a/recipes-bsp/u-boot/u-boot-imx-common_2020.04.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRCBRANCH = "imx_v2020.04_5.4.70_2.3.0"
-SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
-SRCREV = "185bdaaaf5644319284566e5c340927d28954a1a"
-
-DEPENDS += "flex-native bison-native bc-native dtc-native"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
-inherit fsl-u-boot-localversion
-
-LOCALVERSION ?= "-imx_v2020.04_5.4.70_2.3.2"
-
-BOOT_TOOLS = "imx-boot-tools"
-
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc
new file mode 100644
index 00000000..2abcac9b
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc
@@ -0,0 +1,20 @@
+DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRCBRANCH = "lf_v2021.04"
+SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRCREV = "3463140881c523e248d2fcb6bfc9ed25c0db93bd"
+
+DEPENDS += "flex-native bison-native bc-native dtc-native"
+
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
+
+inherit fsl-u-boot-localversion
+
+LOCALVERSION ?= "-imx_v2021.04_5.10.35_2.0.0"
+
+BOOT_TOOLS = "imx-boot-tools"
+
diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2020.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2020.04.bb
deleted file mode 100644
index 2b296c19..00000000
--- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2020.04.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-imx:"
-
-require u-boot-imx_${PV}.bb
-require u-boot-mfgtool.inc
diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb
new file mode 100644
index 00000000..2b296c19
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.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-imx:"
+
+require u-boot-imx_${PV}.bb
+require u-boot-mfgtool.inc
diff --git a/recipes-bsp/u-boot/u-boot-imx_2020.04.bb b/recipes-bsp/u-boot/u-boot-imx_2020.04.bb
deleted file mode 100644
index 40772e2b..00000000
--- a/recipes-bsp/u-boot/u-boot-imx_2020.04.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright 2018 (C) O.S. Systems Software LTDA.
-# Copyright (C) 2017-2021 NXP
-
-require recipes-bsp/u-boot/u-boot.inc
-require u-boot-imx-common_${PV}.inc
-
-PROVIDES += "u-boot"
-
-do_deploy_append_mx8m() {
-    # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
-    if [ -n "${UBOOT_CONFIG}" ]
-    then
-        for config in ${UBOOT_MACHINE}; do
-            i=$(expr $i + 1);
-            for type in ${UBOOT_CONFIG}; do
-                j=$(expr $j + 1);
-                if [ $j -eq $i ]
-                then
-                    install -d ${DEPLOYDIR}/${BOOT_TOOLS}
-                    install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME}  ${DEPLOYDIR}/${BOOT_TOOLS}
-                    install -m 0777 ${B}/${config}/u-boot-nodtb.bin  ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG}
-                fi
-            done
-            unset  j
-        done
-        unset  i
-    fi
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx6|mx7|mx8|use-mainline-bsp)"
diff --git a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb
new file mode 100644
index 00000000..40772e2b
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb
@@ -0,0 +1,32 @@
+# Copyright (C) 2013-2016 Freescale Semiconductor
+# Copyright 2018 (C) O.S. Systems Software LTDA.
+# Copyright (C) 2017-2021 NXP
+
+require recipes-bsp/u-boot/u-boot.inc
+require u-boot-imx-common_${PV}.inc
+
+PROVIDES += "u-boot"
+
+do_deploy_append_mx8m() {
+    # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
+    if [ -n "${UBOOT_CONFIG}" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            i=$(expr $i + 1);
+            for type in ${UBOOT_CONFIG}; do
+                j=$(expr $j + 1);
+                if [ $j -eq $i ]
+                then
+                    install -d ${DEPLOYDIR}/${BOOT_TOOLS}
+                    install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME}  ${DEPLOYDIR}/${BOOT_TOOLS}
+                    install -m 0777 ${B}/${config}/u-boot-nodtb.bin  ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG}
+                fi
+            done
+            unset  j
+        done
+        unset  i
+    fi
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx6|mx7|mx8|use-mainline-bsp)"
-- 
cgit v1.2.3-54-g00ecf