From ad02a20608b0bbb184fe633bd8a50c785d2002cd Mon Sep 17 00:00:00 2001
From: Mihai Lindner <mihai.lindner@nxp.com>
Date: Tue, 14 May 2019 12:36:55 +0300
Subject: u-boot-imx: Upgrade version 2017.03 to 2018.03

Upgrade version to 2018.03 from branch imx_v2018.03_4.14.98_2.0.0_ga.
Drop usage of dtc-145 binary, pulled by the class with the same name,
which was a workaround for older u-boot versions.

Signed-off-by: Mihai Lindner <mihai.lindner@nxp.com>
---
 recipes-bsp/u-boot/u-boot-imx-mfgtool_2017.03.bb |  6 ---
 recipes-bsp/u-boot/u-boot-imx-mfgtool_2018.03.bb |  6 +++
 recipes-bsp/u-boot/u-boot-imx_2017.03.bb         | 48 ------------------------
 recipes-bsp/u-boot/u-boot-imx_2018.03.bb         | 48 ++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 54 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx-mfgtool_2017.03.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-imx-mfgtool_2018.03.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx_2017.03.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-imx_2018.03.bb

diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2017.03.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2017.03.bb
deleted file mode 100644
index 81799adda..000000000
--- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2017.03.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (C) 2014 O.S. Systems Software LTDA.
-# Copyright (C) 2014-2016 Freescale Semiconductor
-# Copyright 2017 NXP
-
-require u-boot-imx_${PV}.bb
-require u-boot-mfgtool.inc
diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2018.03.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2018.03.bb
new file mode 100644
index 000000000..ec1de27dd
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2018.03.bb
@@ -0,0 +1,6 @@
+# Copyright (C) 2014 O.S. Systems Software LTDA.
+# Copyright (C) 2014-2016 Freescale Semiconductor
+# Copyright 2017-2019 NXP
+
+require u-boot-imx_${PV}.bb
+require u-boot-mfgtool.inc
diff --git a/recipes-bsp/u-boot/u-boot-imx_2017.03.bb b/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
deleted file mode 100644
index 86eca1964..000000000
--- a/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright 2017-2018 NXP
-# Copyright 2018 (C) O.S. Systems Software LTDA.
-
-DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
-require recipes-bsp/u-boot/u-boot.inc
-
-PROVIDES += "u-boot"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRCBRANCH = "imx_v2017.03_4.9.123_imx8mm_ga"
-SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
-SRCREV = "8be98e9322040c655b9e5c9fb2c494e002e3fad9"
-
-S = "${WORKDIR}/git"
-
-inherit dtc-145 fsl-u-boot-localversion
-
-LOCALVERSION ?= "-${SRCBRANCH}"
-
-BOOT_TOOLS = "imx-boot-tools"
-
-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}/tools/mkimage  ${DEPLOYDIR}/${BOOT_TOOLS}/mkimage_uboot
-                    install -m 0777 ${B}/${config}/u-boot-nodtb.bin  ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin
-                fi
-            done
-            unset  j
-        done
-        unset  i
-    fi
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
diff --git a/recipes-bsp/u-boot/u-boot-imx_2018.03.bb b/recipes-bsp/u-boot/u-boot-imx_2018.03.bb
new file mode 100644
index 000000000..fcd341368
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx_2018.03.bb
@@ -0,0 +1,48 @@
+# Copyright (C) 2013-2016 Freescale Semiconductor
+# Copyright 2018 (C) O.S. Systems Software LTDA.
+# Copyright 2017-2019 NXP
+
+DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
+require recipes-bsp/u-boot/u-boot.inc
+
+PROVIDES += "u-boot"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRCBRANCH = "imx_v2018.03_4.14.98_2.0.0_ga"
+SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRCREV = "0d6d8807793e74402e23772062469aeb4808dd48"
+
+S = "${WORKDIR}/git"
+
+inherit fsl-u-boot-localversion
+
+LOCALVERSION ?= "-${SRCBRANCH}"
+
+BOOT_TOOLS = "imx-boot-tools"
+
+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}/tools/mkimage  ${DEPLOYDIR}/${BOOT_TOOLS}/mkimage_uboot
+                    install -m 0777 ${B}/${config}/u-boot-nodtb.bin  ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin
+                fi
+            done
+            unset  j
+        done
+        unset  i
+    fi
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
-- 
cgit v1.2.3-54-g00ecf