From: Chunrong Guo <[email protected]> Following changes are included: 11abda9 - armv8: ls2080ardb: update copyright claim 7d5b814 - Revert "EHCI: Fix endian access issue on EHCI intinalization" 160deab - Revert "powerpc/T104xRDB: Fix endian access issue on EHCI intinalization" 007ac5c - Revert "powerpc/p1_p2_rdb_pc: Fix endian access issue on EHCI intinalization" e82a7bc - LS1043ARBD: Fix SD Boot issue with PPA ec7f4b3 - armv8: ls1088a: change dpl load address to 0x80001000 from 0x80000000 93bb79f - board: freescale: ls1012afrwy: Add LS1012A-FRWY board support. aabf70f - board: freescale: ls1012afrx:Common files to support da97a2b - watchdog: disable to build the driver in default 60afe56 - watchdog: Kconfig: add config to disable wdog reset cf17a12 - watchdog: driver support for layerscape 6ac9ac0 - armv8: ls1088: change ttyS1 to ttyS0 0c9305b - boards: freescale: lsch3: Add 0.9v entry for vid 0346460 - armv8: ls1088a: change dpl load command from apply to lazyapply. c43f05a - drivers/net/vsc9953: Initialize action RAM in VCAP complex 0a1adba - board: Kconfig: Re-Arrangement of PPA firmware and header addresses ecf1d55 - arm: ls1021aqds: config: enable CONFIG_ID_EEPROM for mac command 4d94f28 - board: freescale: ls1012ardb: Add command to switch QSPI bank cba0675 - driver/mtd/spi: Default page size Spansion flash "S25FS512S" is 256b 7c4f3c8 - LS1012AFRWY: Add Secure Boot support 51a93cc - board: move ppa header address in board specific kconfig e26f485 - board: ls1012a: FRWY-LS1012A board support d000b14 - board: move ppa firmware address in board specific kconfig 2f51b35 - armv8: ls1088a: Enable USB in ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig 842df34 - armv8/fsl-lsch2: make the workaround for PIN MUX erratum A010539 robust 1fa9417 - armv8: sec_firmware: Add support for multiple loadables eca9656 - armv8/fsl-lsch2: correct QMAN clock c3a6ed4 - driver: net: fsl-mc: updated copyright info 39966d9 - armv8: ls1088a: Move CONFIG_BOOTARGS and CONFIG_CMD_GREPENV to defconfig ccde7d9 - armv8: ls1088aqds: Enable mdio commands on u-boot prompt 9c912c7 - armv8: sec_firmware: Remove JR3 from device tree node in all cases 5ecc2f5 - mmc: fsl_esdhc: fix probe issue without CONFIG_BLK enabled 8ed20db - usb: Add delay to fix USB 2.0 stick enumeration failure on LS208xA b133620 - EHCI: Fix endian access issue on EHCI intinalization faf6feb - u-boot: fixup the iommu-map property of fsl-mc node 8e0c780 - powerpc: configs: Set initrd_high environment varible
Signed-off-by: Chunrong Guo <[email protected]> --- recipes-bsp/u-boot/u-boot-qoriq_2017.12.bb | 96 ------------------------------ recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb | 96 ++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 96 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-qoriq_2017.12.bb create mode 100644 recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2017.12.bb b/recipes-bsp/u-boot/u-boot-qoriq_2017.12.bb deleted file mode 100644 index 1801350..0000000 --- a/recipes-bsp/u-boot/u-boot-qoriq_2017.12.bb +++ /dev/null @@ -1,96 +0,0 @@ -require recipes-bsp/u-boot/u-boot.inc - -DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards" -PROVIDES += "u-boot" -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 \ -" - -PV_append = "+fslgit" -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" - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/u-boot;nobranch=1 \ -" -SRCREV = "00cde476c84275124a51cb55a53a253cd75fba6c" - -S = "${WORKDIR}/git" - -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}"' - -inherit fsl-u-boot-localversion -LOCALVERSION = "+fsl" - -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.03.bb b/recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb new file mode 100644 index 0000000..437ea85 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-qoriq_2018.03.bb @@ -0,0 +1,96 @@ +require recipes-bsp/u-boot/u-boot.inc + +DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards" +PROVIDES += "u-boot" +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 \ +" + +PV_append = "+fslgit" +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" + +SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/u-boot;nobranch=1 \ +" +SRCREV = "11abda97baeb57109b20c99a1edad6f8205bedbc" + +S = "${WORKDIR}/git" + +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}"' + +inherit fsl-u-boot-localversion +LOCALVERSION = "+fsl" + +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 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
