From 099e51d996af240ecbaaee7ab15a9254773f37ec Mon Sep 17 00:00:00 2001
From: Pierre-Jean Texier <pjtexier@koncepto.io>
Date: Sun, 8 Mar 2020 17:02:39 +0000
Subject: u-boot-fslc: upgrade 2019.07 -> 2020.01

Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
---
 recipes-bsp/u-boot/u-boot-fslc-common_2019.07.inc  | 19 ---------
 recipes-bsp/u-boot/u-boot-fslc-common_2020.01.inc  | 19 +++++++++
 recipes-bsp/u-boot/u-boot-fslc-fw-utils_2019.07.bb | 45 ----------------------
 recipes-bsp/u-boot/u-boot-fslc-fw-utils_2020.01.bb | 45 ++++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2019.07.bb  | 32 ---------------
 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.01.bb  | 32 +++++++++++++++
 recipes-bsp/u-boot/u-boot-fslc_2019.07.bb          | 21 ----------
 recipes-bsp/u-boot/u-boot-fslc_2020.01.bb          | 21 ++++++++++
 8 files changed, 117 insertions(+), 117 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2019.07.inc
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2020.01.inc
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-fw-utils_2019.07.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc-fw-utils_2020.01.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2019.07.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.01.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2019.07.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2020.01.bb

diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2019.07.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2019.07.inc
deleted file mode 100644
index de1d9812..00000000
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2019.07.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 = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
-
-DEPENDS += "bison-native"
-
-SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
-
-SRCREV = "ca0ab152714540f93bab9347ad5b706a0a54f037"
-SRCBRANCH = "2019.07+fslc"
-
-PV = "v2019.07+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2020.01.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2020.01.inc
new file mode 100644
index 00000000..aa5c5d73
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2020.01.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 = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
+
+DEPENDS += "bison-native"
+
+SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
+
+SRCREV = "76594fb45d0de47ba1ea004d2eb1963f799e36c4"
+SRCBRANCH = "2020.01+fslc"
+
+PV = "v2020.01+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2019.07.bb b/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2019.07.bb
deleted file mode 100644
index a809a3f6..00000000
--- a/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2019.07.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-require u-boot-fslc-common_${PV}.inc
-
-SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
-DEPENDS += "mtd-utils"
-
-INSANE_SKIP_${PN} = "already-stripped"
-EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1'
-EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
-
-inherit uboot-config
-
-do_compile () {
-    oe_runmake ${UBOOT_MACHINE}
-    oe_runmake envtools
-}
-
-do_install () {
-    install -d ${D}${base_sbindir}
-    install -d ${D}${sysconfdir}
-    install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
-    install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
-
-    if [ -e ${WORKDIR}/fw_env.config ]; then
-        install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
-    else
-        install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
-    fi
-}
-
-do_install_class-cross () {
-    install -d ${D}${bindir_cross}
-    install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
-    install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
-}
-
-SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross"
-uboot_fw_utils_cross() {
-    sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
-}
-
-PROVIDES += "u-boot-fw-utils"
-RPROVIDES_${PN} += "u-boot-fw-utils"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-BBCLASSEXTEND = "cross"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2020.01.bb b/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2020.01.bb
new file mode 100644
index 00000000..a809a3f6
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2020.01.bb
@@ -0,0 +1,45 @@
+require u-boot-fslc-common_${PV}.inc
+
+SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
+DEPENDS += "mtd-utils"
+
+INSANE_SKIP_${PN} = "already-stripped"
+EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1'
+EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
+
+inherit uboot-config
+
+do_compile () {
+    oe_runmake ${UBOOT_MACHINE}
+    oe_runmake envtools
+}
+
+do_install () {
+    install -d ${D}${base_sbindir}
+    install -d ${D}${sysconfdir}
+    install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
+    install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
+
+    if [ -e ${WORKDIR}/fw_env.config ]; then
+        install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
+    else
+        install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
+    fi
+}
+
+do_install_class-cross () {
+    install -d ${D}${bindir_cross}
+    install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
+    install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
+}
+
+SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross"
+uboot_fw_utils_cross() {
+    sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
+}
+
+PROVIDES += "u-boot-fw-utils"
+RPROVIDES_${PN} += "u-boot-fw-utils"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+BBCLASSEXTEND = "cross"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2019.07.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2019.07.bb
deleted file mode 100644
index 2492f450..00000000
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2019.07.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|mx5|mx6|mx7|vf|use-mainline-bsp)"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.01.bb
new file mode 100644
index 00000000..2492f450
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.01.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|mx5|mx6|mx7|vf|use-mainline-bsp)"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2019.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2019.07.bb
deleted file mode 100644
index 9fc752a1..00000000
--- a/recipes-bsp/u-boot/u-boot-fslc_2019.07.bb
+++ /dev/null
@@ -1,21 +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."
-
-DEPENDS_append = " bc-native dtc-native lzop-native"
-
-PROVIDES += "u-boot"
-
-# 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 = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2020.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2020.01.bb
new file mode 100644
index 00000000..9fc752a1
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc_2020.01.bb
@@ -0,0 +1,21 @@
+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."
+
+DEPENDS_append = " bc-native dtc-native lzop-native"
+
+PROVIDES += "u-boot"
+
+# 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 = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)"
-- 
cgit v1.2.3-54-g00ecf