From 827ebdff1585ae912d1544c6759cff93764997cb Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Tue, 26 Jul 2022 10:18:53 -0500
Subject: u-boot-imx: Upgrade 2021.04 -> 2022.04

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit 48544d4d4342f963f668b1e8416b2b4281e3da8a)
---
 recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc | 18 -----------
 recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc | 18 +++++++++++
 recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb | 12 -------
 recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb | 12 +++++++
 recipes-bsp/u-boot/u-boot-imx_2021.04.bb         | 41 ------------------------
 recipes-bsp/u-boot/u-boot-imx_2022.04.bb         | 41 ++++++++++++++++++++++++
 6 files changed, 71 insertions(+), 71 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc
 create mode 100644 recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx_2021.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-imx_2022.04.bb

(limited to 'recipes-bsp/u-boot')

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
deleted file mode 100644
index 36f948c5..00000000
--- a/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
-
-LICENSE = "GPL-2.0-or-later"
-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 = "f7b43f8b4c1e4e3ee6c6ff2fe9c61b2092e8b96b"
-LOCALVERSION ?= "-imx_v2021.04_5.15.5-1.0.0"
-
-DEPENDS += "flex-native bison-native bc-native dtc-native"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
-inherit fsl-u-boot-localversion
-
-BOOT_TOOLS = "imx-boot-tools"
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc
new file mode 100644
index 00000000..3c9c0f92
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
+
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRCBRANCH = "lf_v2022.04"
+SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRCREV = "1c881f4da83cc05bee50f352fa183263d7e2622b"
+LOCALVERSION ?= "-imx_v2022.04_5.15.32-2.0.0"
+
+DEPENDS += "flex-native bison-native bc-native dtc-native"
+
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
+
+inherit fsl-u-boot-localversion
+
+BOOT_TOOLS = "imx-boot-tools"
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
deleted file mode 100644
index 500b2de0..00000000
--- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb
+++ /dev/null
@@ -1,12 +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
-
-UUU_BOOTLOADER_TAGGED     = ""
-UUU_BOOTLOADER_TAGGED:mx6-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"
-UUU_BOOTLOADER_TAGGED:mx7-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"
diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb
new file mode 100644
index 00000000..500b2de0
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb
@@ -0,0 +1,12 @@
+# 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
+
+UUU_BOOTLOADER_TAGGED     = ""
+UUU_BOOTLOADER_TAGGED:mx6-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"
+UUU_BOOTLOADER_TAGGED:mx7-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"
diff --git a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb
deleted file mode 100644
index 21883af8..00000000
--- a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb
+++ /dev/null
@@ -1,41 +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"
-
-inherit uuu_bootloader_tag
-
-UUU_BOOTLOADER            = ""
-UUU_BOOTLOADER:mx6-nxp-bsp        = "${UBOOT_BINARY}"
-UUU_BOOTLOADER:mx7-nxp-bsp        = "${UBOOT_BINARY}"
-UUU_BOOTLOADER_TAGGED     = ""
-UUU_BOOTLOADER_TAGGED:mx6-nxp-bsp = "u-boot-tagged.${UBOOT_SUFFIX}"
-UUU_BOOTLOADER_TAGGED:mx7-nxp-bsp = "u-boot-tagged.${UBOOT_SUFFIX}"
-
-do_deploy:append:mx8m-nxp-bsp() {
-    # Deploy 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}-${type}
-                fi
-            done
-            unset  j
-        done
-        unset  i
-    fi
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx6-generic-bsp|mx7-generic-bsp|mx8-generic-bsp)"
diff --git a/recipes-bsp/u-boot/u-boot-imx_2022.04.bb b/recipes-bsp/u-boot/u-boot-imx_2022.04.bb
new file mode 100644
index 00000000..21883af8
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx_2022.04.bb
@@ -0,0 +1,41 @@
+# 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"
+
+inherit uuu_bootloader_tag
+
+UUU_BOOTLOADER            = ""
+UUU_BOOTLOADER:mx6-nxp-bsp        = "${UBOOT_BINARY}"
+UUU_BOOTLOADER:mx7-nxp-bsp        = "${UBOOT_BINARY}"
+UUU_BOOTLOADER_TAGGED     = ""
+UUU_BOOTLOADER_TAGGED:mx6-nxp-bsp = "u-boot-tagged.${UBOOT_SUFFIX}"
+UUU_BOOTLOADER_TAGGED:mx7-nxp-bsp = "u-boot-tagged.${UBOOT_SUFFIX}"
+
+do_deploy:append:mx8m-nxp-bsp() {
+    # Deploy 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}-${type}
+                fi
+            done
+            unset  j
+        done
+        unset  i
+    fi
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx6-generic-bsp|mx7-generic-bsp|mx8-generic-bsp)"
-- 
cgit v1.2.3-54-g00ecf