[meta-freescale] [[PATCH v3 03/34] uboot: update to upgrade to 2017.09

[Chunrong Guo]

From: Chunrong Guo <chunrong.guo at nxp.com>

*This includes the following changes:
503eff0 - armv8: ls1046aqds: Fix NAND offset for Fman ucode and env
c66ddf7 - arm64: ls2088ardb: Fix kernel validation failure
44ffe98 - armv8: ls1043ardb: disable PPA loading during SPL stage for SD boot
043c85a - armv8: ls1046ardb: disable PPA loading during SPL stage for SD boot
b68c991 - armv8: fsl-layerscape: Fix some coding style problems in soc.c
25cd705 - board/ls1088: Add fsl_fdt_fixup_flash
85bfc58 - ls1088aqds: Enable IFC and QIXIS in SPL image
96cc4d7 - armv8: fsl-layerscape: Add back L3 flushing for all exception levels
bdf9c1a - fsl-lsch2: csu: correct the workaround A-010315
26aaf13 - armv8/fsl-lsch2: correct QMAN clock
a836f94 - arm64: ls1012ardb: Add distro secure boot support
ef3b345 - arm64: ls1012afrdm: Add distro boot support
2bed40e - arm64: ls1012ardb: Add distro boot support
bb85ef3 - board: common: vid: Move IR chip specific code in flag
806bca8 - board/ls2080ardb: Add mcmemsize variable in default env

Signed-off-by: Chunrong Guo <chunrong.guo at nxp.com>>
---
 ...ot-qoriq_2017.03.bb => u-boot-qoriq_2017.09.bb} | 52 +++++++++++++++++++++-
 1 file changed, 50 insertions(+), 2 deletions(-)
 rename recipes-bsp/u-boot/{u-boot-qoriq_2017.03.bb => u-boot-qoriq_2017.09.bb} (67%)

diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2017.03.bb b/recipes-bsp/u-boot/u-boot-qoriq_2017.09.bb
similarity index 67%
rename from recipes-bsp/u-boot/u-boot-qoriq_2017.03.bb
rename to recipes-bsp/u-boot/u-boot-qoriq_2017.09.bb
index 5bde945..2e1a5ae 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2017.03.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2017.09.bb
@@ -19,9 +19,8 @@ DEPENDS_append_qoriq-arm = " change-file-endianess-native dtc-native tcl-native"
 DEPENDS_append_qoriq-ppc = " boot-format-native"
 
 SRC_URI = "git://github.com/qoriq-open-source/u-boot.git;nobranch=1 \
-    file://fix-build-error-under-gcc6.patch \
 "
-SRCREV = "6fc2946a7b1973a8221cdfeccd1666f2d8eec467"
+SRCREV = "503eff00a7119d2690a662ed64e83e4782b7d3d9"
 
 S = "${WORKDIR}/git"
 
@@ -77,6 +76,10 @@ do_compile_append_qoriq() {
                         cp ${config}/u-boot.format.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX}
                     elif [ "qspi" = "${type}" ];then
                         cp ${config}/${binary} ${config}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
+                    elif [ "sdcard-secure-boot" = "${type}" ];then
+                        cp ${config}/spl/u-boot-spl.bin ${config}/u-boot-spl.bin 
+                    elif [ "nand-secure-boot" = "${type}" ];then
+                        cp ${config}/spl/u-boot-spl.bin ${config}/u-boot-spl.bin
                     fi
                 fi
             done
@@ -87,6 +90,51 @@ do_compile_append_qoriq() {
     unset i
 }
 
+do_install_append_qoriq() {
+    if [ -n "${UBOOT_CONFIG}" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            i=$(expr $i + 1);
+            for type in ${UBOOT_CONFIG}; do
+                j=$(expr $j + 1);
+                if [ $j -eq $i ]; then
+                    if [ "sdcard-secure-boot" = "${type}" ];then
+                        install -m 644 ${B}/${config}/u-boot-spl.bin ${D}/boot/uboot-${type}-spl.bin
+                        install -m 644 ${B}/${config}/u-boot-dtb.bin ${D}/boot/uboot-${type}-dtb.bin
+                    elif [ "nand-secure-boot" = "${type}" ];then
+                        install -m 644 ${B}/${config}/u-boot-spl.bin ${D}/boot/uboot-${type}-spl.bin
+                        install -m 644 ${B}/${config}/u-boot-dtb.bin ${D}/boot/uboot-${type}-dtb.bin
+                    fi
+                fi
+            done
+            unset j
+        done
+        unset  i
+    fi
+}
+
+do_deploy_append_qoriq() {
+    if [ -n "${UBOOT_CONFIG}" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            i=$(expr $i + 1);
+            for type in ${UBOOT_CONFIG}; do
+                j=$(expr $j + 1);
+                if [ $j -eq $i ]; then
+                    if [ "sdcard-secure-boot" = "${type}" ] || [ "nand-secure-boot" = "${type}" ];then
+                        install -d {DEPLOYDIR}
+                        install -m 644 ${B}/${config}/u-boot-spl.bin ${DEPLOYDIR}/uboot-${type}-spl.bin
+                        install -m 644 ${B}/${config}/u-boot-dtb.bin ${DEPLOYDIR}/uboot-${type}-dtb.bin
+                    fi
+                fi
+            done
+            unset j
+        done
+        unset  i
+    fi
+}
+
+
 
 PACKAGES += "${PN}-images"
 FILES_${PN}-images += "/boot"
-- 
1.9.0