u-boot-toradex: Update both u-boot and fw-utils to version 2019.07

Use u-boot-toradex-fw-utils recipe from meta-toradex-nxp layer [1]

1 - https://git.toradex.com/cgit/meta-toradex-nxp.git/tree/recipes-bsp/u-boot/u-boot-toradex-fw-utils_2019.07.bb

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>

recipes-bsp/u-boot/u-boot-toradex-common.inc

@@ -1,19 +1,21 @@
 # Copyright (C) 2015 Toradex AG
-# Based on u-boot-fslc.inc Copyright (C) 2012-2014 O.S. Systems Software LTDA
+# Based on u-boot-fslc.inc Copyright (C) 2012-2020 O.S. Systems Software LTDA
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 SUMMARY = "U-Boot bootloader with support for Toradex Computer on Modules"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
+
+DEPENDS += "flex-native bison-native"
 
 SRC_URI = "git://git.toradex.com/u-boot-toradex.git;branch=${SRCBRANCH}"
 
-SRCREV ?= "aca804c9ddadbf34a8ff82779e5598ec5e319f23"
-SRCBRANCH ?= "2016.11-toradex"
+SRCREV = "694e2136eefc2d110f44b26218c03e44a1e88235"
+SRCBRANCH = "toradex_2019.07"
 
 S = "${WORKDIR}/git"
 
-PV = "2016.11+git${SRCPV}"
+PV = "2019.07+git${SRCPV}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 

recipes-bsp/u-boot/u-boot-toradex-fw-utils/0001-tools-fix-cross-compiling-tools-when-HOSTCC-is-overr.patch

@@ -1,54 +0,0 @@
-From 3b0825296aeba69c2cbfd3e179db2e9cbe5e70d7 Mon Sep 17 00:00:00 2001
-From: Masahiro Yamada <yamada.masahiro@socionext.com>
-Date: Mon, 13 Mar 2017 17:43:16 +0900
-Subject: [PATCH] tools: fix cross-compiling tools when HOSTCC is overridden
-
-Upstream-Status: Backport
-
-Richard reported U-Boot tools issues in OpenEmbedded/Yocto project.
-
-OE needs to be able to change the default compiler. If we pass in
-HOSTCC through the make command, it overwrites all HOSTCC instances,
-including ones in tools/Makefile and tools/env/Makefile, which breaks
-"make cross_tools" and "make env", respectively.
-
-Add "override" directives to avoid overriding HOSTCC instances that
-really need to point to the cross-compiler.
-
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-Reported-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-Reviewed-by: Simon Glass <sjg@chromium.org>
----
- tools/Makefile     | 2 +-
- tools/env/Makefile | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/Makefile b/tools/Makefile
-index 1c840d7..a894b5c 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -262,7 +262,7 @@ $(LOGO_DATA_H):	$(obj)/bmp_logo $(LOGO_BMP)
- subdir- += env
- 
- ifneq ($(CROSS_BUILD_TOOLS),)
--HOSTCC = $(CC)
-+override HOSTCC = $(CC)
- 
- quiet_cmd_crosstools_strip = STRIP   $^
-       cmd_crosstools_strip = $(STRIP) $^; touch $@
-diff --git a/tools/env/Makefile b/tools/env/Makefile
-index 38ad118..95b28c0 100644
---- a/tools/env/Makefile
-+++ b/tools/env/Makefile
-@@ -8,7 +8,7 @@
- # fw_printenv is supposed to run on the target system, which means it should be
- # built with cross tools. Although it may look weird, we only replace "HOSTCC"
- # with "CC" here for the maximum code reuse of scripts/Makefile.host.
--HOSTCC = $(CC)
-+override HOSTCC = $(CC)
- 
- # Compile for a hosted environment on the target
- HOST_EXTRACFLAGS  = $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
--- 
-2.7.4
-

recipes-bsp/u-boot/u-boot-toradex-fw-utils/fw_unlock_mmc.sh

@@ -0,0 +1,6 @@
+# Give fw_setenv mmcblk0boot0 write permissions
+fw_setenv() {
+    echo 0 > /sys/block/mmcblk0boot0/force_ro
+    /sbin/fw_setenv "$@"
+    echo 1 > /sys/block/mmcblk0boot0/force_ro
+}

recipes-bsp/u-boot/u-boot-toradex-fw-utils_2019.07.bb

@@ -1,30 +1,51 @@
-require recipes-bsp/u-boot/u-boot-toradex_${PV}.inc
+require u-boot-toradex-common.inc
 
 SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
-
-SRC_URI += "file://0001-tools-fix-cross-compiling-tools-when-HOSTCC-is-overr.patch \
-            file://fw_env.config \
-"
-
 DEPENDS += "mtd-utils"
 
+SRC_URI += " \
+    file://fw_env.config \
+    file://fw_unlock_mmc.sh \
+"
+
 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'
+EXTRA_OEMAKE_class-cross = 'HOSTCC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
 
 inherit uboot-config
 
 do_compile () {
     oe_runmake ${UBOOT_MACHINE}
-    oe_runmake env
+    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
-    install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
+    ln -s 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
+}
+
+install_unlock_emmc() {
+    install -Dm 0644 ${WORKDIR}/fw_unlock_mmc.sh ${D}${sysconfdir}/profile.d/fw_unlock_mmc.sh
+}
+
+do_install_append_apalis-imx6() {
+    install_unlock_emmc
+}
+
+do_install_append_colibri-imx6() {
+    install_unlock_emmc
+}
+
+do_install_append_colibri-imx7-emmc() {
+    install_unlock_emmc
 }
 
 do_install_class-cross () {

recipes-bsp/u-boot/u-boot-toradex_2016.11.bb

@@ -1,8 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-require recipes-bsp/u-boot/u-boot-toradex_${PV}.inc
-
-LOCALVERSION = "-2.8.3"
-
-PROVIDES += "u-boot"
-
-inherit fsl-u-boot-localversion dtc-145

recipes-bsp/u-boot/u-boot-toradex_2019.07.bb

@@ -0,0 +1,11 @@
+require recipes-bsp/u-boot/u-boot.inc
+require recipes-bsp/u-boot/u-boot-toradex-common.inc
+
+DEPENDS += "bc-native dtc-native"
+
+PROVIDES += "u-boot"
+
+B = "${WORKDIR}/build"
+do_configure[cleandirs] = "${B}"
+
+inherit fsl-u-boot-localversion