[02/24] u-boot: update to c873063

Submitted by C.R. Guo on July 5, 2019, 8:43 a.m. | Patch ID: 162791

Details

Message ID 1562316188-16744-2-git-send-email-chunrong.guo@nxp.com
State New
Headers show

Commit Message

C.R. Guo July 5, 2019, 8:43 a.m.
From: Chunrong Guo <chunrong.guo@nxp.com>

*update to lsdk 1906 tag
include the following changes:
c873063 - common: qixis: make the qixis compatible with new soc
4fe7bca - armv8: ls1028a: Add environment variables to facilitate the boot
d7baae8 - dm: i2c: lx2160: Revert lx2160 i2c dm support patch set
3c75182 - armv8: lx2160ardb : Add slave nodes under the i2c0 controller
1807bb1 - armv8: lx2160ardb : Add pcf2127 node
600e32c - armv8: dts: fsl-lx2160a: add i2c controller and gpio DT nodes
efe84a3 - gpio: do not include <asm/arch/gpio.h> on ARCH_LX2160A
8fbdb38 - drivers: i2c: mxc: Solve the compiler error when using i2c dm mode
210c880 - configs: lx2160a: enable DM support for pcf2127 rtc
4691972 - armv8: lx2160a: The lx2160a platform supports the I2C driver model.
9b6da05 - board/freescale/common: secure_boot: Set bootdelay to -2.
c419c9c - armv8: fsl-layerscape: Increase mmc read size for secure-boot headers
e3a324e - configs: fsl-layerscape: secure_boot: Enable setexpr command.
03313e4 - armv8: dts: ls1028a: Add FSPI node for ls1028ardb and ls1028aqds
47a485c - configs: ls1028a: Enable FSPI support for ls1028ardb and ls1028aqds
7a5853e - mtd: spi-nor-ids: Add micron mt35xu02g flash ID
d5cf4da - configs: ls1012: unset CONFIG_SPI_FLASH_BAR, move CONFIG_FSL_QSPI to defconfig
bcdf1cb - driver: spi: Update QSPI driver xfer
0c337c2 - armv8: ls2088ardb: Fix MC firmware loading during SD boot
336202e - armv8: ls2088aqds: Fix MC firmware loading during SD boot
7be353f - armv8: ls2088aqds: Add bootcmd for TFA boot
9664bf5 - armv8: fsl-layerscape: Change bootcmd update logic
3bad029 - ls1046ardb: Add CONFIG_ENV_ADDR to init env in qspi boot
b892a5c - armv8: fsl-lsch2: add clock support for the second eSDHC
6bec285 - configs: ls1088aqds: Enable config to write aligned data to TxFIFO
7db76c5 - arm64: configs: ls1046afrwy: config update
268ebc5 - armv8: fsl-layerscape: Update qspi clk cfg
da7f6ec - armv8/fsl-layerscape: Add loop to check L3 dcache status
55007f3 - ARM: dts: ls1021a: Fixed reg for sata node

*Upgrade version to 2019.04

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-common_2019.04.inc | 19 ++++++
 .../u-boot/u-boot-qoriq-fw-utils_2018.09.bb        | 45 ------------
 .../u-boot/u-boot-qoriq-fw-utils_2019.04.bb        | 45 ++++++++++++
 recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb         | 79 ----------------------
 recipes-bsp/u-boot/u-boot-qoriq_2019.04.bb         | 79 ++++++++++++++++++++++
 6 files changed, 143 insertions(+), 143 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-qoriq-common_2018.09.inc
 create mode 100644 recipes-bsp/u-boot/u-boot-qoriq-common_2019.04.inc
 delete mode 100644 recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2018.09.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2019.04.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-qoriq_2019.04.bb

Patch hide | download patch | download mbox

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
deleted file mode 100644
index 06ec01b..0000000
--- a/recipes-bsp/u-boot/u-boot-qoriq-common_2018.09.inc
+++ /dev/null
@@ -1,19 +0,0 @@ 
-
-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= "80b2d2bc4cab0a8363c9b7eba8064b1795f12670"
-
-S = "${WORKDIR}/git"
-PV_append = "+fslgit"
-LOCALVERSION = "+fsl"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq-common_2019.04.inc b/recipes-bsp/u-boot/u-boot-qoriq-common_2019.04.inc
new file mode 100644
index 0000000..46e4314
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-qoriq-common_2019.04.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= "c873063750db4479feee58a1d97f38a0934ea7b9"
+
+S = "${WORKDIR}/git"
+PV_append = "+fslgit"
+LOCALVERSION = "+fsl"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2018.09.bb b/recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2018.09.bb
deleted file mode 100644
index 1107812..0000000
--- a/recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2018.09.bb
+++ /dev/null
@@ -1,45 +0,0 @@ 
-require u-boot-qoriq-common_${PV}.inc
-
-SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
-DEPENDS = "mtd-utils bison-native"
-
-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'
-
-inherit uboot-config
-
-do_compile () {
-    oe_runmake ${UBOOT_MACHINE}
-    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
-
-    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
-}
-
-do_install_class-cross () {
-    install -d ${D}${bindir_cross}
-    install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
-    install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
-}
-
-SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross"
-uboot_fw_utils_cross() {
-    sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
-}
-
-PROVIDES += "u-boot-fw-utils"
-RPROVIDES_${PN} += "u-boot-fw-utils"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-BBCLASSEXTEND = "cross"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2019.04.bb b/recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2019.04.bb
new file mode 100644
index 0000000..1107812
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2019.04.bb
@@ -0,0 +1,45 @@ 
+require u-boot-qoriq-common_${PV}.inc
+
+SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
+DEPENDS = "mtd-utils bison-native"
+
+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'
+
+inherit uboot-config
+
+do_compile () {
+    oe_runmake ${UBOOT_MACHINE}
+    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
+
+    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
+}
+
+do_install_class-cross () {
+    install -d ${D}${bindir_cross}
+    install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
+    install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
+}
+
+SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross"
+uboot_fw_utils_cross() {
+    sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
+}
+
+PROVIDES += "u-boot-fw-utils"
+RPROVIDES_${PN} += "u-boot-fw-utils"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+BBCLASSEXTEND = "cross"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb b/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb
deleted file mode 100644
index f48dc81..0000000
--- a/recipes-bsp/u-boot/u-boot-qoriq_2018.09.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 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") == "external-fsl":
-        return
-
-    ml = d.getVar("MULTILIB_VARIANTS")
-    arch = d.getVar("OVERRIDES")
-
-    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')
-        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')
-        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_2019.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2019.04.bb
new file mode 100644
index 0000000..f48dc81
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2019.04.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") == "external-fsl":
+        return
+
+    ml = d.getVar("MULTILIB_VARIANTS")
+    arch = d.getVar("OVERRIDES")
+
+    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')
+        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')
+        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)"