From f5573c6b9c8d89cc5362fd95c762f1fab1aff191 Mon Sep 17 00:00:00 2001
From: Ian Coolidge <ian@boundarydevices.com>
Date: Fri, 5 Oct 2018 17:36:08 +0200
Subject: [PATCH] u-boot-boundary: Update to v2018.07

From: Ian Coolidge <ian@boundarydevices.com>

Compatible with nitrogem8m board

Blog post: https://boundarydevices.com/u-boot-v2018-07/

Signed-off-by: Ian Coolidge <ian@boundarydevices.com>
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../u-boot-boundary-common_2017.03.imx8m.inc  | 15 -------
 ...inc => u-boot-boundary-common_2018.07.inc} |  8 ++--
 .../aarch64/fw_env.config                     |  1 +
 .../{ => arm}/fw_env.config                   |  0
 ...bb => u-boot-boundary-fw-utils_2018.07.bb} |  8 +++-
 .../u-boot/u-boot-boundary_2017.03.imx8m.bb   |  6 ---
 recipes-bsp/u-boot/u-boot-boundary_2017.07.bb |  6 ---
 recipes-bsp/u-boot/u-boot-boundary_2018.07.bb | 17 +++++++
 .../u-boot-script-boundary_2017.03.imx8m.bb   | 45 -------------------
 ...7.bb => u-boot-script-boundary_2018.07.bb} |  2 +-
 10 files changed, 29 insertions(+), 79 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-boundary-common_2017.03.imx8m.inc
 rename recipes-bsp/u-boot/{u-boot-boundary-common_2017.07.inc => u-boot-boundary-common_2018.07.inc} (51%)
 create mode 100644 recipes-bsp/u-boot/u-boot-boundary-fw-utils/aarch64/fw_env.config
 rename recipes-bsp/u-boot/u-boot-boundary-fw-utils/{ => arm}/fw_env.config (100%)
 rename recipes-bsp/u-boot/{u-boot-boundary-fw-utils_2017.07.bb => u-boot-boundary-fw-utils_2018.07.bb} (83%)
 delete mode 100644 recipes-bsp/u-boot/u-boot-boundary_2017.03.imx8m.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-boundary_2017.07.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-boundary_2018.07.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-script-boundary_2017.03.imx8m.bb
 rename recipes-bsp/u-boot/{u-boot-script-boundary_2017.07.bb => u-boot-script-boundary_2018.07.bb} (94%)

diff --git a/recipes-bsp/u-boot/u-boot-boundary-common_2017.03.imx8m.inc b/recipes-bsp/u-boot/u-boot-boundary-common_2017.03.imx8m.inc
deleted file mode 100644
index 63f2bac..0000000
--- a/recipes-bsp/u-boot/u-boot-boundary-common_2017.03.imx8m.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "U-Boot for Boundary Devices boards"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
-
-PV = "v2017.03.imx8m+git${SRCPV}"
-
-SRCREV = "962210405277c99520aa4c5185c5aa2d589fbd1d"
-SRCBRANCH = "boundary-imx_v2017.03_4.9.51_imx8m_ga"
-SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git;branch=${SRCBRANCH}"
-
-S = "${WORKDIR}/git"
-
-inherit dtc-145
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/u-boot/u-boot-boundary-common_2017.07.inc b/recipes-bsp/u-boot/u-boot-boundary-common_2018.07.inc
similarity index 51%
rename from recipes-bsp/u-boot/u-boot-boundary-common_2017.07.inc
rename to recipes-bsp/u-boot/u-boot-boundary-common_2018.07.inc
index 4263fa1..9b9b363 100644
--- a/recipes-bsp/u-boot/u-boot-boundary-common_2017.07.inc
+++ b/recipes-bsp/u-boot/u-boot-boundary-common_2018.07.inc
@@ -1,11 +1,11 @@
 DESCRIPTION = "U-Boot for Boundary Devices boards"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 
-PV = "v2017.07+git${SRCPV}"
+PV = "v2018.07+git${SRCPV}"
 
-SRCREV = "445823ef2abfff2fc1c63cc53c57c1e139f88b1b"
-SRCBRANCH = "boundary-v2017.07"
+SRCREV = "f35ba6cfbe5a0f039ec14e790e212564e98c84d6"
+SRCBRANCH = "boundary-v2018.07"
 SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot-boundary-fw-utils/aarch64/fw_env.config b/recipes-bsp/u-boot/u-boot-boundary-fw-utils/aarch64/fw_env.config
new file mode 100644
index 0000000..eccfb0f
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-boundary-fw-utils/aarch64/fw_env.config
@@ -0,0 +1 @@
+/dev/mmcblk0boot0	0x1fe000	0x2000		0x1000
diff --git a/recipes-bsp/u-boot/u-boot-boundary-fw-utils/fw_env.config b/recipes-bsp/u-boot/u-boot-boundary-fw-utils/arm/fw_env.config
similarity index 100%
rename from recipes-bsp/u-boot/u-boot-boundary-fw-utils/fw_env.config
rename to recipes-bsp/u-boot/u-boot-boundary-fw-utils/arm/fw_env.config
diff --git a/recipes-bsp/u-boot/u-boot-boundary-fw-utils_2017.07.bb b/recipes-bsp/u-boot/u-boot-boundary-fw-utils_2018.07.bb
similarity index 83%
rename from recipes-bsp/u-boot/u-boot-boundary-fw-utils_2017.07.bb
rename to recipes-bsp/u-boot/u-boot-boundary-fw-utils_2018.07.bb
index f5dd879..56ba151 100644
--- a/recipes-bsp/u-boot/u-boot-boundary-fw-utils_2017.07.bb
+++ b/recipes-bsp/u-boot/u-boot-boundary-fw-utils_2018.07.bb
@@ -1,7 +1,11 @@
 require u-boot-boundary-common_${PV}.inc
 
 SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
-DEPENDS = "mtd-utils"
+DEPENDS += "mtd-utils bison-native"
+
+FILESEXTRAPATHS_prepend_mx6 := "${THISDIR}/${PN}/arm:"
+FILESEXTRAPATHS_prepend_mx7 := "${THISDIR}/${PN}/arm:"
+FILESEXTRAPATHS_prepend_mx8 := "${THISDIR}/${PN}/aarch64:"
 
 SRC_URI += " \
    file://fw_env.config \
@@ -15,7 +19,7 @@ inherit uboot-config
 
 do_compile () {
     oe_runmake ${UBOOT_MACHINE}
-    oe_runmake env
+    oe_runmake envtools
 }
 
 do_install () {
diff --git a/recipes-bsp/u-boot/u-boot-boundary_2017.03.imx8m.bb b/recipes-bsp/u-boot/u-boot-boundary_2017.03.imx8m.bb
deleted file mode 100644
index ba0f680..0000000
--- a/recipes-bsp/u-boot/u-boot-boundary_2017.03.imx8m.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-require recipes-bsp/u-boot/u-boot-boundary-common_${PV}.inc
-
-PROVIDES += "u-boot"
-
-COMPATIBLE_MACHINE = "(nitrogen8m)"
diff --git a/recipes-bsp/u-boot/u-boot-boundary_2017.07.bb b/recipes-bsp/u-boot/u-boot-boundary_2017.07.bb
deleted file mode 100644
index 2e683db..0000000
--- a/recipes-bsp/u-boot/u-boot-boundary_2017.07.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-require recipes-bsp/u-boot/u-boot-boundary-common_${PV}.inc
-
-PROVIDES += "u-boot"
-
-COMPATIBLE_MACHINE = "(nitrogen6x-lite|nitrogen6x|nitrogen6sx|nitrogen7)"
diff --git a/recipes-bsp/u-boot/u-boot-boundary_2018.07.bb b/recipes-bsp/u-boot/u-boot-boundary_2018.07.bb
new file mode 100644
index 0000000..d9417f5
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-boundary_2018.07.bb
@@ -0,0 +1,17 @@
+require recipes-bsp/u-boot/u-boot.inc
+require recipes-bsp/u-boot/u-boot-boundary-common_${PV}.inc
+
+DEPENDS += "bison-native"
+
+PROVIDES += "u-boot"
+
+BOOT_TOOLS = "imx-boot-tools"
+
+do_deploy_append_mx8mq () {
+	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}
+}
+
+COMPATIBLE_MACHINE = "(nitrogen6x-lite|nitrogen6x|nitrogen6sx|nitrogen7|nitrogen8m)"
diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_2017.03.imx8m.bb b/recipes-bsp/u-boot/u-boot-script-boundary_2017.03.imx8m.bb
deleted file mode 100644
index ade3ad3..0000000
--- a/recipes-bsp/u-boot/u-boot-script-boundary_2017.03.imx8m.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-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 arm64 -O linux -T script -C none -a 0 -e 0 \
-                  -n "boot script" -d ${BOOTSCRIPT} ${S}/boot.scr
-
-    uboot-mkimage -A arm64 -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 = "(nitrogen8m)"
diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_2017.07.bb b/recipes-bsp/u-boot/u-boot-script-boundary_2018.07.bb
similarity index 94%
rename from recipes-bsp/u-boot/u-boot-script-boundary_2017.07.bb
rename to recipes-bsp/u-boot/u-boot-script-boundary_2018.07.bb
index 211cb84..ef47d5f 100644
--- a/recipes-bsp/u-boot/u-boot-script-boundary_2017.07.bb
+++ b/recipes-bsp/u-boot/u-boot-script-boundary_2018.07.bb
@@ -42,4 +42,4 @@ addtask deploy after do_install before do_build
 
 FILES_${PN} += "/"
 
-COMPATIBLE_MACHINE = "(nitrogen6x|nitrogen6x-lite|nitrogen6sx|nitrogen7)"
+COMPATIBLE_MACHINE = "(nitrogen6x-lite|nitrogen6x|nitrogen6sx|nitrogen7|nitrogen8m)"