From 97e35e7f3fe3790cdddd1b8fb75c933af6ecf831 Mon Sep 17 00:00:00 2001 From: Vinicius Aquino Date: Tue, 27 Apr 2021 14:27:35 -0300 Subject: u-boot-fslc: Update to version 2021.04 Signed-off-by: Vinicius Aquino --- recipes-bsp/u-boot/u-boot-fslc-common_2020.10.inc | 19 ------ recipes-bsp/u-boot/u-boot-fslc-common_2021.04.inc | 19 ++++++ recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.10.bb | 8 --- recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.04.bb | 8 +++ recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.10.bb | 32 ---------- recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.04.bb | 32 ++++++++++ recipes-bsp/u-boot/u-boot-fslc_2020.10.bb | 73 ----------------------- recipes-bsp/u-boot/u-boot-fslc_2021.04.bb | 73 +++++++++++++++++++++++ 8 files changed, 132 insertions(+), 132 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2020.10.inc create mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2021.04.inc delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.10.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.04.bb delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.10.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.04.bb delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2020.10.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2021.04.bb (limited to 'recipes-bsp') diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2020.10.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2020.10.inc deleted file mode 100644 index b0e665e07..000000000 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2020.10.inc +++ /dev/null @@ -1,19 +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=5a7450c57ffe5ae63fd732446b988025" - -DEPENDS += "bison-native" - -SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" - -SRCREV = "80c23498b425447a4a04d2a85ca4c2aec6ec349a" -SRCBRANCH = "2020.10+fslc" - -PV = "v2020.10+git${SRCPV}" - -S = "${WORKDIR}/git" -B = "${WORKDIR}/build" diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2021.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2021.04.inc new file mode 100644 index 000000000..05f3d951d --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2021.04.inc @@ -0,0 +1,19 @@ +# 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=5a7450c57ffe5ae63fd732446b988025" + +DEPENDS += "bison-native" + +SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" + +SRCREV = "31cf6b483b580898c7387ed97e69304ea8cc7c96" +SRCBRANCH = "2021.04+fslc" + +PV = "v2021.04+git${SRCPV}" + +S = "${WORKDIR}/git" +B = "${WORKDIR}/build" diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.10.bb deleted file mode 100644 index 7f02746b0..000000000 --- a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.10.bb +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (C) 2014 O.S. Systems Software LTDA. -# Copyright (C) 2014-2016 Freescale Semiconductor -# Copyright 2017-2019 NXP - -FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-fslc:" - -require u-boot-fslc_${PV}.bb -require u-boot-mfgtool.inc diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.04.bb new file mode 100644 index 000000000..7f02746b0 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.04.bb @@ -0,0 +1,8 @@ +# Copyright (C) 2014 O.S. Systems Software LTDA. +# Copyright (C) 2014-2016 Freescale Semiconductor +# Copyright 2017-2019 NXP + +FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-fslc:" + +require u-boot-fslc_${PV}.bb +require u-boot-mfgtool.inc diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.10.bb deleted file mode 100644 index 2492f4503..000000000 --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.10.bb +++ /dev/null @@ -1,32 +0,0 @@ -require u-boot-fslc-common_${PV}.inc - -DESCRIPTION = "U-boot bootloader mxsboot tool" -SECTION = "bootloader" - -DEPENDS = "bison-native dtc openssl" - -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' - -do_compile () { - oe_runmake -C ${S} O=${B} sandbox_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 -C ${S} O=${B} cross_tools NO_SDL=1 -} - -do_install () { - install -Dm 0755 tools/mxsboot ${D}${bindir}/uboot-mxsboot - ln -sf uboot-mxsboot ${D}${bindir}/mxsboot -} - -COMPATIBLE_MACHINE_class-target = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" - -BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.04.bb new file mode 100644 index 000000000..2492f4503 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.04.bb @@ -0,0 +1,32 @@ +require u-boot-fslc-common_${PV}.inc + +DESCRIPTION = "U-boot bootloader mxsboot tool" +SECTION = "bootloader" + +DEPENDS = "bison-native dtc openssl" + +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' + +do_compile () { + oe_runmake -C ${S} O=${B} sandbox_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 -C ${S} O=${B} cross_tools NO_SDL=1 +} + +do_install () { + install -Dm 0755 tools/mxsboot ${D}${bindir}/uboot-mxsboot + ln -sf uboot-mxsboot ${D}${bindir}/mxsboot +} + +COMPATIBLE_MACHINE_class-target = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" + +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/u-boot/u-boot-fslc_2020.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2020.10.bb deleted file mode 100644 index 86620c443..000000000 --- a/recipes-bsp/u-boot/u-boot-fslc_2020.10.bb +++ /dev/null @@ -1,73 +0,0 @@ -require recipes-bsp/u-boot/u-boot.inc -require u-boot-fslc-common_${PV}.inc - -DESCRIPTION = "U-Boot based on mainline U-Boot used by FSL Community BSP in \ -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." - -inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')} - -DEPENDS += "bc-native dtc-native lzop-native" - -# Location known to imx-boot component, where U-Boot artifacts -# should be additionally deployed. -# See below note above do_deploy_append_mx8m for the purpose of -# this delopyment location -BOOT_TOOLS = "imx-boot-tools" - -PROVIDES += "u-boot" - -B = "${WORKDIR}/build" - -# FIXME: Allow linking of 'tools' binaries with native libraries -# used for generating the boot logo and other tools used -# during the build process. -EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ - HOSTLDFLAGS="${BUILD_LDFLAGS}" \ - HOSTSTRIP=true' - -# -# imx8m machines require additional deployment tasks to be -# carried out due to the fact that final boot image is constructed -# using imx-boot recipe. It produces a boot binary image, which is -# constructed from various binary components (u-boot with separate -# dtb, atf, DDR firmware and optional op-tee) into a single image -# using FIT format. This image is then parsed and loaded either via -# SPL directly (imx8mm), or using bootrom code (imx8mn and imx8mp). -# -# In order for imx-boot to construct the final binary boot image, -# it is required that the U-Boot dtb files are to be deployed into -# a location known by imx-boot so they could be picked up and -# inserted into the boot container. -# -# NOTE: This is only applicable to those derivatives of mx8m family, -# which did not adopt the boot container mechanism provided by U-Boot -# build system itself. U-Boot is capable of producing a result binary, -# which includes all those deployed pieces below, hence once derivative -# starts to use it - below append would not be necessary. -# Once all mx8m derivatives are migrated to use the 'flash.bin' boot -# container - this append can be dropped completely. -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}/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 = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" diff --git a/recipes-bsp/u-boot/u-boot-fslc_2021.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2021.04.bb new file mode 100644 index 000000000..86620c443 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc_2021.04.bb @@ -0,0 +1,73 @@ +require recipes-bsp/u-boot/u-boot.inc +require u-boot-fslc-common_${PV}.inc + +DESCRIPTION = "U-Boot based on mainline U-Boot used by FSL Community BSP in \ +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." + +inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')} + +DEPENDS += "bc-native dtc-native lzop-native" + +# Location known to imx-boot component, where U-Boot artifacts +# should be additionally deployed. +# See below note above do_deploy_append_mx8m for the purpose of +# this delopyment location +BOOT_TOOLS = "imx-boot-tools" + +PROVIDES += "u-boot" + +B = "${WORKDIR}/build" + +# FIXME: Allow linking of 'tools' binaries with native libraries +# used for generating the boot logo and other tools used +# during the build process. +EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ + HOSTLDFLAGS="${BUILD_LDFLAGS}" \ + HOSTSTRIP=true' + +# +# imx8m machines require additional deployment tasks to be +# carried out due to the fact that final boot image is constructed +# using imx-boot recipe. It produces a boot binary image, which is +# constructed from various binary components (u-boot with separate +# dtb, atf, DDR firmware and optional op-tee) into a single image +# using FIT format. This image is then parsed and loaded either via +# SPL directly (imx8mm), or using bootrom code (imx8mn and imx8mp). +# +# In order for imx-boot to construct the final binary boot image, +# it is required that the U-Boot dtb files are to be deployed into +# a location known by imx-boot so they could be picked up and +# inserted into the boot container. +# +# NOTE: This is only applicable to those derivatives of mx8m family, +# which did not adopt the boot container mechanism provided by U-Boot +# build system itself. U-Boot is capable of producing a result binary, +# which includes all those deployed pieces below, hence once derivative +# starts to use it - below append would not be necessary. +# Once all mx8m derivatives are migrated to use the 'flash.bin' boot +# container - this append can be dropped completely. +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}/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 = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" -- cgit v1.2.3-54-g00ecf