diff options
Diffstat (limited to 'recipes-bsp/u-boot')
| -rw-r--r-- | recipes-bsp/u-boot/libubootenv_%.bbappend | 43 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-fslc-common_2019.07.inc | 18 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc | 19 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-fslc-fw-utils_2019.07.bb | 45 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb (renamed from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2019.07.bb) | 24 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-fslc_2024.04.bb (renamed from recipes-bsp/u-boot/u-boot-fslc_2019.07.bb) | 10 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc | 25 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-imx-mfgtool_2018.03.bb | 6 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-imx_2018.03.bb | 48 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-imx_2023.04.bb | 63 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-mfgtool.inc | 21 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-qoriq-common_2018.09.inc | 19 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2018.09.bb | 45 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb (renamed from recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb) | 41 |
14 files changed, 204 insertions, 223 deletions
diff --git a/recipes-bsp/u-boot/libubootenv_%.bbappend b/recipes-bsp/u-boot/libubootenv_%.bbappend new file mode 100644 index 00000000..619b510e --- /dev/null +++ b/recipes-bsp/u-boot/libubootenv_%.bbappend @@ -0,0 +1,43 @@ +# Fixup for the libubootenv which rely on uboot-config class for no good reason. +# +# This is not intended to be permanent but we need to get the integration +# working and there is no good solution for now so we are adding this in a +# non-intrusive way and using the `IMX_DEFAULT_BOOTLOADER` as a guard to do any +# code execution. + +def fixup_uboot_config_dependency(d): + ubootmachine = d.getVar("UBOOT_MACHINE") + ubootconfig = (d.getVar('UBOOT_CONFIG') or "").split() + imx_default_bootloader = d.get('IMX_DEFAULT_BOOTLOADER') + + if not ubootmachine and not ubootconfig and imx_default_bootloader: + # FIXME: We need to provide the UBOOT_MACHINE or UBOOT_CONFIG to allow libubootenv to + # build. This is caused by the commit below: + # + # ,----[ libubootenv change ] + # | commit 10aa1291979fb90bed1beb49be4d406ed0e1e4d5 ┃ + # | ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━ + # | Author: Ming Liu <liu.ming50@gmail.com> + # | Date: Tue Aug 25 20:08:01 2020 +0200 + # | + # | libubootenv: inherit uboot-config + # | + # | This mainly aims to involve in the sanity check of UBOOT_CONFIG and + # | UBOOT_MACHINE, it will throw a error message at recipe parsing time if + # | neither of them is set, and libubootenv would be skipped. + # | + # | Signed-off-by: Ming Liu <liu.ming50@gmail.com> + # | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + # `---- + ubootmachine = d.getVar("UBOOT_MACHINE:pn-%s" % imx_default_bootloader) + ubootconfig = (d.getVar("UBOOT_CONFIG:pn-%s" % imx_default_bootloader) or "").split() + + d.setVar("UBOOT_CONFIG", ubootconfig) + d.setVar("UBOOT_MACHINE", ubootmachine) + +python fixup_uboot_config_dependency_handler() { + fixup_uboot_config_dependency(d) +} + +fixup_uboot_config_dependency_handler[eventmask] = "bb.event.RecipePreFinalise" +addhandler fixup_uboot_config_dependency_handler diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2019.07.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2019.07.inc deleted file mode 100644 index 949064e4..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2019.07.inc +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (C) 2012-2019 O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) - -inherit fsl-u-boot-localversion - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" - -DEPENDS += "bison-native" - -SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" - -SRCREV = "4992c59e46bd6e9d1f5d51f976f031399f70e729" -SRCBRANCH = "2019.07+fslc" - -PV = "v2019.07+git${SRCPV}" - -S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc new file mode 100644 index 00000000..b270dfd7 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc @@ -0,0 +1,19 @@ +# Copyright (C) 2012-2022 O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +inherit fsl-u-boot-localversion + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" + +DEPENDS += "flex-native bison-native" + +SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https" + +SRCREV = "1a2bdc16b79a6f9c31829ede1bbf4063ccea6e54" +SRCBRANCH = "2024.04+fslc" + +PV = "2024.04+git${SRCPV}" + +S = "${WORKDIR}/git" +B = "${WORKDIR}/build" diff --git a/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2019.07.bb b/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2019.07.bb deleted file mode 100644 index a809a3f6..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2019.07.bb +++ /dev/null @@ -1,45 +0,0 @@ -require u-boot-fslc-common_${PV}.inc - -SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" -DEPENDS += "mtd-utils" - -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-fslc-mxsboot_2019.07.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb index 9123b331..b7e4ca76 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2019.07.bb +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb @@ -3,23 +3,33 @@ require u-boot-fslc-common_${PV}.inc DESCRIPTION = "U-boot bootloader mxsboot tool" SECTION = "bootloader" -DEPENDS = "bison-native dtc openssl" +inherit python3native + +DEPENDS += " \ + bison-native \ + dtc \ + gnutls \ + openssl \ + python3-setuptools-native \ + swig-native \ + util-linux-libuuid \ +" PROVIDES = "u-boot-mxsboot" -EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' -EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' -EXTRA_OEMAKE_class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' +EXTRA_OEMAKE:class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' +EXTRA_OEMAKE:class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' +EXTRA_OEMAKE:class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' do_compile () { - oe_runmake sandbox_defconfig + oe_runmake -C ${S} O=${B} tools-only_defconfig # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and # generating it requires bin2header tool, which for target build # is built with target tools and thus cannot be executed on host. sed -i "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" .config - oe_runmake cross_tools NO_SDL=1 + oe_runmake -C ${S} O=${B} cross_tools NO_SDL=1 } do_install () { @@ -27,6 +37,6 @@ do_install () { ln -sf uboot-mxsboot ${D}${bindir}/mxsboot } -COMPATIBLE_MACHINE_class-target = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" +COMPATIBLE_MACHINE:class-target = "(mxs-generic-bsp)" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/u-boot/u-boot-fslc_2019.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb index 2a17792f..eba8876a 100644 --- a/recipes-bsp/u-boot/u-boot-fslc_2019.07.bb +++ b/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb @@ -6,9 +6,13 @@ order to provide support for some backported features and fixes, or because it \ was submitted for revision and it takes some time to become part of a stable \ version, or because it is not applicable for upstreaming." -DEPENDS_append = " bc-native dtc-native" +inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')} -PROVIDES += "u-boot" +DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native" + +PROVIDES += "u-boot u-boot-mfgtool" + +B = "${WORKDIR}/build" # FIXME: Allow linking of 'tools' binaries with native libraries # used for generating the boot logo and other tools used @@ -18,4 +22,4 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ HOSTSTRIP=true' PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" +COMPATIBLE_MACHINE = "(imx-generic-bsp)" diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc new file mode 100644 index 00000000..e2323562 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards." + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" +SRCBRANCH = "lf_v2023.04" +LOCALVERSION ?= "-imx_v2023.04_6.6.3-1.0.0" +SRCREV = "f8a2983ec83afd43731d905b4ff0ffd57b57f2f0" + +DEPENDS += " \ + bc-native \ + bison-native \ + dtc-native \ + flex-native \ + gnutls-native \ + xxd-native \ +" + +S = "${WORKDIR}/git" +B = "${WORKDIR}/build" + +inherit fsl-u-boot-localversion + +BOOT_TOOLS = "imx-boot-tools" diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2018.03.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2018.03.bb deleted file mode 100644 index ec1de27d..00000000 --- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2018.03.bb +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (C) 2014 O.S. Systems Software LTDA. -# Copyright (C) 2014-2016 Freescale Semiconductor -# Copyright 2017-2019 NXP - -require u-boot-imx_${PV}.bb -require u-boot-mfgtool.inc diff --git a/recipes-bsp/u-boot/u-boot-imx_2018.03.bb b/recipes-bsp/u-boot/u-boot-imx_2018.03.bb deleted file mode 100644 index ed32ffcb..00000000 --- a/recipes-bsp/u-boot/u-boot-imx_2018.03.bb +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (C) 2013-2016 Freescale Semiconductor -# Copyright 2018 (C) O.S. Systems Software LTDA. -# Copyright 2017-2019 NXP - -DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards." -require recipes-bsp/u-boot/u-boot.inc - -PROVIDES += "u-boot" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRCBRANCH = "imx_v2018.03_4.14.98_2.0.0_ga" -SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" -SRCREV = "0d6d8807793e74402e23772062469aeb4808dd48" - -S = "${WORKDIR}/git" - -inherit fsl-u-boot-localversion - -LOCALVERSION ?= "-${SRCBRANCH}" - -BOOT_TOOLS = "imx-boot-tools" - -do_deploy_append_mx8m() { - # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary - 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 - 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}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} - fi - done - unset j - done - unset i - fi -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" diff --git a/recipes-bsp/u-boot/u-boot-imx_2023.04.bb b/recipes-bsp/u-boot/u-boot-imx_2023.04.bb new file mode 100644 index 00000000..0e7c467b --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-imx_2023.04.bb @@ -0,0 +1,63 @@ +# Copyright (C) 2013-2016 Freescale Semiconductor +# Copyright 2018 (C) O.S. Systems Software LTDA. +# Copyright (C) 2017-2023 NXP + +require recipes-bsp/u-boot/u-boot.inc +require u-boot-imx-common_${PV}.inc + +PROVIDES += "u-boot u-boot-mfgtool" + +inherit uuu_bootloader_tag + +UUU_BOOTLOADER = "" +UUU_BOOTLOADER:mx6-generic-bsp = "${UBOOT_BINARY}" +UUU_BOOTLOADER:mx7-generic-bsp = "${UBOOT_BINARY}" +UUU_BOOTLOADER_TAGGED = "" +UUU_BOOTLOADER_TAGGED:mx6-generic-bsp = "u-boot-tagged.${UBOOT_SUFFIX}" +UUU_BOOTLOADER_TAGGED:mx7-generic-bsp = "u-boot-tagged.${UBOOT_SUFFIX}" +UUU_BOOTLOADER_UNTAGGED = "" +UUU_BOOTLOADER_UNTAGGED:mx6-generic-bsp = "u-boot-untagged.${UBOOT_SUFFIX}" +UUU_BOOTLOADER_UNTAGGED:mx7-generic-bsp = "u-boot-untagged.${UBOOT_SUFFIX}" + +do_deploy:append:mx8m-generic-bsp() { + # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary + 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 + install -d ${DEPLOYDIR}/${BOOT_TOOLS} + install -m 0644 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${type} + UBOOT_DTB_NAME_FLAGS="${type}:${UBOOT_DTB_NAME}" + for key_value in ${UBOOT_DTB_NAME_FLAGS}; do + local type_key="${key_value%%:*}" + local dtb_name="${key_value#*:}" + if [ "$type_key" = "$type" ] + then + bbnote "UBOOT_CONFIG = $type, UBOOT_DTB_NAME = $dtb_name" + # There is only one ${dtb_name}, the first one. All the other are with the type appended + if [ ! -f "${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}" ]; then + install -m 0644 ${B}/${config}/arch/arm/dts/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name} + else + bbwarn "Use custom wks.in for $dtb_name = $type" + fi + install -m 0644 ${B}/${config}/arch/arm/dts/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}-${type} + fi + unset type_key + unset dtb_name + done + + unset UBOOT_DTB_NAME_FLAGS + fi + done + unset j + done + unset i + fi +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(mx6-generic-bsp|mx7-generic-bsp|mx8-generic-bsp|mx9-generic-bsp)" diff --git a/recipes-bsp/u-boot/u-boot-mfgtool.inc b/recipes-bsp/u-boot/u-boot-mfgtool.inc deleted file mode 100644 index 91526ad7..00000000 --- a/recipes-bsp/u-boot/u-boot-mfgtool.inc +++ /dev/null @@ -1,21 +0,0 @@ -# Produces a Manufacturing Tool compatible U-Boot -# -# This makes a separated binary set for Manufacturing Tool use -# without clobbering the U-Boot used for normal use. -# -# This file must to be included after the original u-boot.inc file, -# as it overrides the need values. -# -# Copyright (C) 2014 O.S. Systems Software LTDA. - -# Adjust provides -PROVIDES = "u-boot-mfgtool" - -# Use 'mfgtool' config -UBOOT_CONFIG = "mfgtool" - -# Add 'mfgtool' suffix -UBOOT_IMAGE = "u-boot-${MACHINE}-mfgtool-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-${MACHINE}-mfgtool.${UBOOT_SUFFIX}" -SPL_IMAGE = "${SPL_BINARY}-${MACHINE}-mfgtool-${PV}-${PR}" -SPL_SYMLINK = "${SPL_BINARY}-mfgtool-${MACHINE}" 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 06ec01bc..00000000 --- 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-fw-utils_2018.09.bb b/recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2018.09.bb deleted file mode 100644 index 11078124..00000000 --- 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_2018.09.bb b/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb index f48dc81f..c46eae33 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb @@ -1,14 +1,32 @@ 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" +inherit fsl-u-boot-localversion + +LICENSE = "GPL-2.0-only & BSD-3-Clause & BSD-2-Clause & LGPL-2.0-only & LGPL-2.1-only" +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://github.com/nxp-qoriq/u-boot;protocol=https;nobranch=1" +SRCREV= "1c0116f3da250c5a52858c53efb8b38c0963f477" + +S = "${WORKDIR}/git" +B = "${WORKDIR}/build" +PV:append = "+fslgit" +LOCALVERSION = "+fsl" + 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" +DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc bison-native bc-native swig-native python3-native python3-setuptools-native" +DEPENDS:append:qoriq-arm64 = " dtc-native" +DEPENDS:append:qoriq-arm = " dtc-native" +DEPENDS:append:qoriq-ppc = " boot-format-native" python () { if d.getVar("TCMODE") == "external-fsl": @@ -23,8 +41,8 @@ python () { 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('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: @@ -33,8 +51,8 @@ python () { 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('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 + '-') } @@ -46,8 +64,9 @@ ENDIANNESS_LD = "${@bb.utils.contains("LE_UBOOT_FOR_ARMBE_TARGET", "1", "-EL", " 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}"' +EXTRA_OEMAKE += 'STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}' -do_compile_append_qoriq() { +do_compile:append:qoriq() { unset i j k for config in ${UBOOT_MACHINE}; do i=`expr $i + 1`; @@ -75,5 +94,5 @@ do_compile_append_qoriq() { PACKAGES += "${PN}-images" -FILES_${PN}-images += "/boot" +FILES:${PN}-images += "/boot" COMPATIBLE_MACHINE = "(qoriq)" |