[PATCH v2 08/41] u-boot-qoriq: Upgrade version to 2018.09

["C.r. Guo" <chunrong.guo@nxp.com>]

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

*update to lsdk 1812 tag
include the following changes
c08de7c - SecureBoot_LX2160A: Correct the kernel header offset.
619d0d3 - ls2080ardb: check enablement of QSPI using DCFG_RCWSR15
0dfcc1f - ls1088a: Update the device tree for IFC/QSPI
8875034 - net/phy: Cortina CS4223 driver updates & bugfixes
88fa585 - mmc: fsl_esdhc: make get_cd work well in dm_mmc_ops
2211378 - Revert "pci: layerscape: Add the dts fixup for EP and RC"
f8358cf - armv8: fsl-layerscape: properly configure qdma ICID
f24e259 - lx2160: Enable support of EMC2305
1a858e3 - armv8: emc2305: add support for fan controller
f37025a - fsl-ls2088ardb: dts: enabling SATA node
ff3e128 - board/ls1046aqds: Bypass xfi port fixup for KR mode on LS1046AQDS
2c3c67e - armv8: ls2088ardb: change default device tree in defconfig for TFABOOT
7f79b25 - armv8: ls1088aqds: add support for ifc-nor boot for TFABOOT
c1b55a8 - detect ifc-nor flash at run-time
6c99ca4 - pci: layerscape: Add the dts fixup for EP and RC
ccfc35d - pci: layerscape: Do not scan when PEX work in EP mode
dd167bc - pci: layerscape: Modify the EP and RC mode judge method
26defec - armv8,lx2160a: Initialize ethernet array in serdes_init
2851185 - armv8: lx2160a: Update CONFIG_SYS_FSL_PEBUF_BASE
cce8348 - board/ls2088ardb: Update the device tree for IFC/QSPI
830ac80 - Correct QSPI bootcommand for LS2088 TFA boot
899e696 - ls2088ardb: add QSPI support for TFA-BOOT
a9fb32b - ls1043a: add support for nand-boot cmd for TFA
c2b3374 - arm64: lx2160ardb: enable DM support for sata
0f80b76 - armv8: dts: fsl-lx2160a: add sata node support
a10b3fc - board/lx2160a: Update xspi_bootcmd, sd_bootcmd env
ee09465 - armv8:LX2160: Adds distro secure boot support.
9a7d1e0 - drivers/spi: Disable hybrid mode for SPANSION S25FS-S family
6b04587 - drivers/spi: Introduce functions to read/write any register
a748abd - fsl_qspi: Modify handling of RDAR, WRAR, 4K_ERASE commands
2af4cbd - armv8: lx2160a: Modify dspi1 controller intrrupts property
612bc35 - Enable sata configs to Kconfig for all LayerScape boards
358229b - armv8: ls1043aqds: modify the qspi_bootcmd definition

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/u-boot/u-boot-qoriq-common_2018.09.inc | 19 ++++++
 recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb         | 79 ----------------------
 recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb         | 79 ++++++++++++++++++++++
 3 files changed, 98 insertions(+), 79 deletions(-)
 create mode 100644 recipes-bsp/u-boot/u-boot-qoriq-common_2018.09.inc
 delete mode 100644 recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb

diff --git a/recipes-bsp/u-boot/u-boot-qoriq-common_2018.09.inc b/recipes-bsp/u-boot/u-boot-qoriq-common_2018.09.inc
new file mode 100644
index 0000000..a3a554c
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-qoriq-common_2018.09.inc
@@ -0,0 +1,19 @@
+
+inherit fsl-u-boot-localversion
+
+LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
+LIC_FILES_CHKSUM = " \
+    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
+    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
+    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
+"
+
+SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/u-boot;nobranch=1 \
+"
+SRCREV= "c08de7c3c92d45a824500ad936f4d72465c181ec"
+
+S = "${WORKDIR}/git"
+PV_append = "+fslgit"
+LOCALVERSION = "+fsl"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb b/recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb
deleted file mode 100644
index 0ad754f..0000000
--- a/recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb
+++ /dev/null
@@ -1,79 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-require u-boot-qoriq-common_${PV}.inc
-
-DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards"
-PROVIDES += "u-boot"
-
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc"
-DEPENDS_append_qoriq-arm64 = " change-file-endianess-native dtc-native tcl-native"
-DEPENDS_append_qoriq-arm = " change-file-endianess-native dtc-native tcl-native"
-DEPENDS_append_qoriq-ppc = " boot-format-native"
-
-python () {
-    if d.getVar("TCMODE", True) == "external-fsl":
-        return
-
-    ml = d.getVar("MULTILIB_VARIANTS", True)
-    arch = d.getVar("OVERRIDES", True)
-
-    if "e5500-64b:" in arch or "e6500-64b:" in arch:
-        if not "lib32" in ml:
-            raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
-        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib32-linux'
-        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
-        d.setVar('DEPENDS_append', ' lib32-gcc-cross-powerpc lib32-libgcc')
-        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/powerpc' + sys_multilib)
-        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib32-recipe-sysroot')
-        d.setVar("WRAP_TARGET_PREFIX", 'powerpc' + sys_multilib + '-')
-    elif "fsl-lsch2-32b:" in arch:
-        if not "lib64" in ml:
-            raise bb.parse.SkipRecipe("Building the u-boot for this arch requires multilib to be enabled")
-        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux'
-        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
-        d.setVar('DEPENDS_append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
-        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
-        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot')
-        d.setVar("WRAP_TARGET_PREFIX", 'aarch64' + sys_multilib + '-')
-}
-
-LE_UBOOT_FOR_ARMBE_TARGET ?= "0"
-ENDIANNESS_GCC = "${@bb.utils.contains("LE_UBOOT_FOR_ARMBE_TARGET", "1", "-mlittle-endian", "", d)}"
-ENDIANNESS_LD = "${@bb.utils.contains("LE_UBOOT_FOR_ARMBE_TARGET", "1", "-EL", "", d)}"
-
-WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
-EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${ENDIANNESS_GCC}" LD="${WRAP_TARGET_PREFIX}ld ${ENDIANNESS_LD}" V=1'
-EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
-
-do_compile_append_qoriq() {
-    unset i j k
-    for config in ${UBOOT_MACHINE}; do
-        i=`expr $i + 1`;
-        for type in ${UBOOT_CONFIG}; do
-            j=`expr $j + 1`;
-            for binary in ${UBOOT_BINARIES}; do
-                k=`expr $k + 1`
-                if [ $j -eq $i ] && [ $k -eq $i ]; then
-                    if [ -n "${BOOTFORMAT_CONFIG}" ] && echo "${type}" |grep -q spi;then
-                        # regenerate spi binary if BOOTFORMAT_CONFIG is set
-                        boot_format ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
-                            ${config}/u-boot-${type}.${UBOOT_SUFFIX} -spi ${config}/u-boot.format.bin
-                        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}
-                    fi
-                fi
-            done
-            unset k
-        done
-        unset j
-    done
-    unset i
-}
-
-
-PACKAGES += "${PN}-images"
-FILES_${PN}-images += "/boot"
-COMPATIBLE_MACHINE = "(qoriq)"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb b/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb
new file mode 100644
index 0000000..d01efdd
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb
@@ -0,0 +1,79 @@
+require recipes-bsp/u-boot/u-boot.inc
+require u-boot-qoriq-common_${PV}.inc
+
+DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards"
+PROVIDES += "u-boot"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc bison-native bc-native swig-native python-native"
+DEPENDS_append_qoriq-arm64 = " change-file-endianess-native dtc-native tcl-native"
+DEPENDS_append_qoriq-arm = " change-file-endianess-native dtc-native tcl-native"
+DEPENDS_append_qoriq-ppc = " boot-format-native"
+
+python () {
+    if d.getVar("TCMODE", True) == "external-fsl":
+        return
+
+    ml = d.getVar("MULTILIB_VARIANTS", True)
+    arch = d.getVar("OVERRIDES", True)
+
+    if "e5500-64b:" in arch or "e6500-64b:" in arch:
+        if not "lib32" in ml:
+            raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
+        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib32-linux'
+        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
+        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
+        d.setVar('DEPENDS_append', ' lib32-gcc-cross-powerpc lib32-libgcc')
+        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/powerpc' + sys_multilib)
+        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib32-recipe-sysroot')
+        d.setVar("WRAP_TARGET_PREFIX", 'powerpc' + sys_multilib + '-')
+    elif "fsl-lsch2-32b:" in arch:
+        if not "lib64" in ml:
+            raise bb.parse.SkipRecipe("Building the u-boot for this arch requires multilib to be enabled")
+        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux'
+        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
+        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
+        d.setVar('DEPENDS_append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
+        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
+        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot')
+        d.setVar("WRAP_TARGET_PREFIX", 'aarch64' + sys_multilib + '-')
+}
+
+LE_UBOOT_FOR_ARMBE_TARGET ?= "0"
+ENDIANNESS_GCC = "${@bb.utils.contains("LE_UBOOT_FOR_ARMBE_TARGET", "1", "-mlittle-endian", "", d)}"
+ENDIANNESS_LD = "${@bb.utils.contains("LE_UBOOT_FOR_ARMBE_TARGET", "1", "-EL", "", d)}"
+
+WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
+EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${ENDIANNESS_GCC}" LD="${WRAP_TARGET_PREFIX}ld ${ENDIANNESS_LD}" V=1'
+EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
+
+do_compile_append_qoriq() {
+    unset i j k
+    for config in ${UBOOT_MACHINE}; do
+        i=`expr $i + 1`;
+        for type in ${UBOOT_CONFIG}; do
+            j=`expr $j + 1`;
+            for binary in ${UBOOT_BINARIES}; do
+                k=`expr $k + 1`
+                if [ $j -eq $i ] && [ $k -eq $i ]; then
+                    if [ -n "${BOOTFORMAT_CONFIG}" ] && echo "${type}" |grep -q spi;then
+                        # regenerate spi binary if BOOTFORMAT_CONFIG is set
+                        boot_format ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
+                            ${config}/u-boot-${type}.${UBOOT_SUFFIX} -spi ${config}/u-boot.format.bin
+                        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}
+                    fi
+                fi
+            done
+            unset k
+        done
+        unset j
+    done
+    unset i
+}
+
+
+PACKAGES += "${PN}-images"
+FILES_${PN}-images += "/boot"
+COMPATIBLE_MACHINE = "(qoriq)"
-- 
2.7.4