From 5264a3a3d2f04f15fab13fa086a0149493636401 Mon Sep 17 00:00:00 2001
From: Fabio Berton <fabio.berton@ossystems.com.br>
Date: Wed, 9 Dec 2020 11:46:06 -0300
Subject: u-boot-fslc: Update to version 2020.10

The following commit:

commit 824ed85b77da741a77fa34c8887c37c5151a15a3
Author: Anastasiia Lukianenko <anastasiia_lukianenko@epam.com>
Date:   Thu Aug 6 12:42:44 2020 +0300

    Add MIT License

Signed-off-by: Anastasiia Lukianenko <anastasiia_lukianenko@epam.com>

changed license file, update md5 checksum to match the new value.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 recipes-bsp/u-boot/u-boot-fslc-common_2020.04.inc | 19 --------------
 recipes-bsp/u-boot/u-boot-fslc-common_2020.10.inc | 19 ++++++++++++++
 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.04.bb | 32 -----------------------
 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.10.bb | 32 +++++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-fslc_2020.04.bb         | 23 ----------------
 recipes-bsp/u-boot/u-boot-fslc_2020.10.bb         | 23 ++++++++++++++++
 6 files changed, 74 insertions(+), 74 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2020.04.inc
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2020.10.inc
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.10.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2020.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2020.10.bb

(limited to 'recipes-bsp')

diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2020.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2020.04.inc
deleted file mode 100644
index 94db11cc..00000000
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2020.04.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 = "88c58453be8cd87eb55f8e283ac4dcce5b59006d"
-SRCBRANCH = "2020.04+fslc"
-
-PV = "v2020.04+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2020.10.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2020.10.inc
new file mode 100644
index 00000000..fcadc994
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2020.10.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=5a7450c57ffe5ae63fd732446b988025"
+
+DEPENDS += "bison-native"
+
+SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
+
+SRCREV = "5003fc093c40895e541fe481016bd3220078a81c"
+SRCBRANCH = "2020.10+fslc"
+
+PV = "v2020.10+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.04.bb
deleted file mode 100644
index 2492f450..00000000
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.04.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.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.10.bb
new file mode 100644
index 00000000..2492f450
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.10.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_2020.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2020.04.bb
deleted file mode 100644
index 64588efc..00000000
--- a/recipes-bsp/u-boot/u-boot-fslc_2020.04.bb
+++ /dev/null
@@ -1,23 +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"
-
-B = "${WORKDIR}/build"
-
-# 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.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2020.10.bb
new file mode 100644
index 00000000..64588efc
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc_2020.10.bb
@@ -0,0 +1,23 @@
+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"
+
+B = "${WORKDIR}/build"
+
+# 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