From 0096007d7ab4e421d37b9eb01a427e40f81d5d0c Mon Sep 17 00:00:00 2001
From: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
Date: Fri, 8 Jul 2022 17:59:19 +0200
Subject: Switch U-Boot to toradex_imx_lf_v2022.04

Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>

Related-to: ELB-4581
---
 .../u-boot/u-boot-toradex-common_2020.04.inc       | 45 ----------------------
 .../u-boot/u-boot-toradex-common_2022.04.inc       | 45 ++++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-toradex_2020.04.bb       | 11 ------
 recipes-bsp/u-boot/u-boot-toradex_2022.04.bb       | 11 ++++++
 4 files changed, 56 insertions(+), 56 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc
 create mode 100644 recipes-bsp/u-boot/u-boot-toradex-common_2022.04.inc
 delete mode 100644 recipes-bsp/u-boot/u-boot-toradex_2020.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-toradex_2022.04.bb

(limited to 'recipes-bsp')

diff --git a/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc b/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc
deleted file mode 100644
index 11ce070..0000000
--- a/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
-SECTION = "bootloaders"
-DEPENDS += "flex-native bison-native"
-
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRC_URI = " \
-    git://git.toradex.com/u-boot-toradex.git;protocol=https;branch=${SRCBRANCH} \
-    file://fw_env.config \
-"
-
-SRCREV = "91a1b19e7384c0eca4ed96a0cae16d2f7d95fbb7"
-SRCREV:use-head-next = "${AUTOREV}"
-SRCBRANCH = "toradex_imx_v2020.04_5.4.70_2.3.0"
-
-S = "${WORKDIR}/git"
-
-inherit toradex-u-boot-localversion
-
-UBOOT_INITIAL_ENV = "u-boot-initial-env"
-
-COMPATIBLE_MACHINE = "(mx8-generic-bsp)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_deploy:append:mx8m-generic-bsp() {
-    # Deploy the 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
-}
diff --git a/recipes-bsp/u-boot/u-boot-toradex-common_2022.04.inc b/recipes-bsp/u-boot/u-boot-toradex-common_2022.04.inc
new file mode 100644
index 0000000..a90e5c5
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-toradex-common_2022.04.inc
@@ -0,0 +1,45 @@
+HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
+SECTION = "bootloaders"
+DEPENDS += "flex-native bison-native"
+
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRC_URI = " \
+    git://git.toradex.com/u-boot-toradex.git;protocol=https;branch=${SRCBRANCH} \
+    file://fw_env.config \
+"
+
+SRCREV = "1c881f4da83cc05bee50f352fa183263d7e2622b"
+SRCREV:use-head-next = "${AUTOREV}"
+SRCBRANCH = "toradex_imx_lf_v2022.04"
+
+S = "${WORKDIR}/git"
+
+inherit toradex-u-boot-localversion
+
+UBOOT_INITIAL_ENV = "u-boot-initial-env"
+
+COMPATIBLE_MACHINE = "(mx8-generic-bsp)"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_deploy:append:mx8m-generic-bsp() {
+    # Deploy the 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
+}
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb b/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb
deleted file mode 100644
index c301226..0000000
--- a/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-require u-boot-toradex-common_${PV}.inc
-
-SUMMARY = "U-Boot bootloader with support for Toradex i.MX 8 series SoMs"
-
-B = "${WORKDIR}/build"
-
-PROVIDES += "u-boot"
-DEPENDS:append = " dtc-native"
-
-BOOT_TOOLS = "imx-boot-tools"
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2022.04.bb b/recipes-bsp/u-boot/u-boot-toradex_2022.04.bb
new file mode 100644
index 0000000..c301226
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-toradex_2022.04.bb
@@ -0,0 +1,11 @@
+require recipes-bsp/u-boot/u-boot.inc
+require u-boot-toradex-common_${PV}.inc
+
+SUMMARY = "U-Boot bootloader with support for Toradex i.MX 8 series SoMs"
+
+B = "${WORKDIR}/build"
+
+PROVIDES += "u-boot"
+DEPENDS:append = " dtc-native"
+
+BOOT_TOOLS = "imx-boot-tools"
-- 
cgit v1.2.3