u-boot-boundary: bump version to v2017.07

Brings many updates/fixes, most important one being the use of standard
bootdistro commands/variables.

Therefore the legacy 6x_bootscript/upgrade scripts have been removed in
favor of boot.scr and upgrade.scr.

Also, the HOSTCC patch isn't needed anymore since included in mainline
U-Boot.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

recipes-bsp/u-boot/u-boot-boundary-common_2017.07.inc

@@ -2,10 +2,10 @@ DESCRIPTION = "U-Boot for Boundary Devices boards"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
 
-PV = "v2016.03+git${SRCPV}"
+PV = "v2017.07+git${SRCPV}"
 
-SRCREV = "0dbffd30b6a81b53c8a4780490ea625ccbfa5596"
+SRCREV = "445823ef2abfff2fc1c63cc53c57c1e139f88b1b"
-SRCBRANCH = "boundary-v2016.03"
+SRCBRANCH = "boundary-v2017.07"
 SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"

recipes-bsp/u-boot/u-boot-boundary-fw-utils/default-gcc.patch

@@ -1,39 +0,0 @@
-OE needs to be able to change the default compiler. If we pass in HOSTCC
-through the make command, it overwrites not only this setting but also the 
-setting in tools/Makefile wrapped in ifneq ($(CROSS_BUILD_TOOLS),) which 
-breaks the build.
-
-We therefore use override to ensure the value of HOSTCC is overwritten when
-needed.
-
-RP: Updated the patch to the version being submitted to upstream u-boot
-
-Upstream-Status: Submitted [emailed to Masahiro Yamada for discussion]
-RP 2017/3/11
-
-Index: git/tools/Makefile
-===================================================================
---- git.orig/tools/Makefile
-+++ git/tools/Makefile
-@@ -262,7 +262,7 @@ $(LICENSE_H): $(obj)/bin2header $(srctre
- subdir- += env
- 
- ifneq ($(CROSS_BUILD_TOOLS),)
--HOSTCC = $(CC)
-+override HOSTCC = $(CC)
- 
- quiet_cmd_crosstools_strip = STRIP   $^
-       cmd_crosstools_strip = $(STRIP) $^; touch $@
-Index: git/tools/env/Makefile
-===================================================================
---- git.orig/tools/env/Makefile
-+++ git/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))) \

recipes-bsp/u-boot/u-boot-boundary-fw-utils_2017.07.bb

@@ -4,7 +4,6 @@ SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
 DEPENDS = "mtd-utils"
 
 SRC_URI += " \
-   file://default-gcc.patch \
    file://fw_env.config \
 "
 

recipes-bsp/u-boot/u-boot-script-boundary_2016.03.bb

@@ -1,54 +0,0 @@
-require recipes-bsp/u-boot/u-boot-boundary-common_${PV}.inc
-
-DEPENDS = "u-boot-mkimage-native"
-
-inherit deploy
-
-BOOTSCRIPT ??= "${S}/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt"
-BOOTSCRIPT_use-mainline-bsp ??= "${S}/board/boundary/nitrogen6x/6x_bootscript-mainline.txt"
-
-UPGRADESCRIPT = "${S}/board/boundary/nitrogen6x/6x_upgrade.txt"
-
-do_mkimage () {
-    # allow deploy to use the ${MACHINE} name to simplify things
-    if [ ! -d ${S}/board/boundary/${MACHINE} ]; then
-        mkdir ${S}/board/boundary/${MACHINE}
-    fi
-
-    uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
-                  -n "boot script" -d ${BOOTSCRIPT} \
-                  ${S}/board/boundary/${MACHINE}/6x_bootscript
-
-    uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
-                  -n "upgrade script" -d ${UPGRADESCRIPT} \
-                  ${S}/board/boundary/${MACHINE}/6x_upgrade
-}
-
-addtask mkimage after do_compile before do_install
-
-do_compile[noexec] = "1"
-
-do_install () {
-    install -D -m 644 ${S}/board/boundary/${MACHINE}/6x_bootscript \
-                      ${D}/6x_bootscript
-    install -D -m 644 ${S}/board/boundary/${MACHINE}/6x_upgrade \
-                      ${D}/6x_upgrade
-}
-
-do_deploy () {
-    install -D -m 644 ${D}/6x_bootscript \
-                      ${DEPLOYDIR}/6x_bootscript-${MACHINE}-${PV}-${PR}
-    install -D -m 644 ${D}/6x_upgrade \
-                      ${DEPLOYDIR}/6x_upgrade-${MACHINE}-${PV}-${PR}
-
-    cd ${DEPLOYDIR}
-    rm -f 6x_bootscript-${MACHINE} 6x_upgrade-${MACHINE}
-    ln -sf 6x_bootscript-${MACHINE}-${PV}-${PR} 6x_bootscript-${MACHINE}
-    ln -sf 6x_upgrade-${MACHINE}-${PV}-${PR} 6x_upgrade-${MACHINE}
-}
-
-addtask deploy after do_install before do_build
-
-FILES_${PN} += "/"
-
-COMPATIBLE_MACHINE = "(nitrogen6x|nitrogen6x-lite|nitrogen6sx|nitrogen7)"

recipes-bsp/u-boot/u-boot-script-boundary_2017.07.bb

@@ -0,0 +1,45 @@
+require recipes-bsp/u-boot/u-boot-boundary-common_${PV}.inc
+
+DEPENDS = "u-boot-mkimage-native"
+
+inherit deploy
+
+BOOTSCRIPT ??= "${S}/board/boundary/bootscripts/bootscript-yocto.txt"
+BOOTSCRIPT_use-mainline-bsp ??= "${S}/board/boundary/bootscripts/bootscript-mainline.txt"
+
+UPGRADESCRIPT = "${S}/board/boundary/bootscripts/upgrade.txt"
+
+do_mkimage () {
+    uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
+                  -n "boot script" -d ${BOOTSCRIPT} ${S}/boot.scr
+
+    uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
+                  -n "upgrade script" -d ${UPGRADESCRIPT} ${S}/upgrade.scr
+}
+
+addtask mkimage after do_compile before do_install
+
+do_compile[noexec] = "1"
+
+do_install () {
+    install -D -m 644 ${S}/boot.scr ${D}/boot.scr
+    install -D -m 644 ${S}/upgrade.scr ${D}/upgrade.scr
+}
+
+do_deploy () {
+    install -D -m 644 ${D}/boot.scr \
+                      ${DEPLOYDIR}/boot.scr-${MACHINE}-${PV}-${PR}
+    install -D -m 644 ${D}/upgrade.scr \
+                      ${DEPLOYDIR}/upgrade.scr-${MACHINE}-${PV}-${PR}
+
+    cd ${DEPLOYDIR}
+    rm -f boot.scr-${MACHINE} upgrade.scr-${MACHINE}
+    ln -sf boot.scr-${MACHINE}-${PV}-${PR} boot.scr-${MACHINE}
+    ln -sf upgrade.scr-${MACHINE}-${PV}-${PR} upgrade.scr-${MACHINE}
+}
+
+addtask deploy after do_install before do_build
+
+FILES_${PN} += "/"
+
+COMPATIBLE_MACHINE = "(nitrogen6x|nitrogen6x-lite|nitrogen6sx|nitrogen7)"