From 8518e03ea3013b40288c6c2887532ca6ddac92c4 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Wed, 4 Jan 2023 14:41:32 +0200 Subject: u-boot-fslc: upgrade to v2023.01+fslc U-Boot fork has been updated to include new version v2023.01 from upstream. Following commits were ported from 2022.10+fslc revision: ---- - 598f87fbdb6 imx6qdl-sabresd: Pass mmc alias - 1b64b05f407 imx: iMX6: Define disconnect_from_pc function - 0335a01b6d5 MLK-21854-2 imx: uuu: Update autoboot to run uuu or fastboot - 9a38462d252 pico-imx6ul, pico-imx7d: Explain how to use eMMC user partition - 881d7241411 mx6sabre_common: Dynamically change the video output - e427569fa3e mx6sabresd: Enable video interfaces in bootargs ---- Update U-Boot recipe versions and point to new revision. Signed-off-by: Oleksandr Suvorov (cherry picked from commit 65a85cfc9da2ec8872e3b431db84acc6f6ca6da9) --- recipes-bsp/u-boot/u-boot-fslc-common_2022.10.inc | 19 -------------- recipes-bsp/u-boot/u-boot-fslc-common_2023.01.inc | 19 ++++++++++++++ recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.10.bb | 8 ------ recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb | 8 ++++++ recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.10.bb | 32 ----------------------- recipes-bsp/u-boot/u-boot-fslc-mxsboot_2023.01.bb | 32 +++++++++++++++++++++++ recipes-bsp/u-boot/u-boot-fslc_2022.10.bb | 25 ------------------ recipes-bsp/u-boot/u-boot-fslc_2023.01.bb | 25 ++++++++++++++++++ 8 files changed, 84 insertions(+), 84 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2022.10.inc create mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2023.01.inc delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.10.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.10.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2023.01.bb delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2022.10.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2023.01.bb diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2022.10.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2022.10.inc deleted file mode 100644 index 9e5cfe5e..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2022.10.inc +++ /dev/null @@ -1,19 +0,0 @@ -# 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 = "cbd7eb17ac1f781b9c511982e43d52f4304f0fd5" -SRCBRANCH = "2022.10+fslc" - -PV = "2022.10+git${SRCPV}" - -S = "${WORKDIR}/git" -B = "${WORKDIR}/build" diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2023.01.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2023.01.inc new file mode 100644 index 00000000..478b9688 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2023.01.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 = "598f87fbdb6ce46b1959fda3ffbfaa41a64338e1" +SRCBRANCH = "2023.01+fslc" + +PV = "2023.01+git${SRCPV}" + +S = "${WORKDIR}/git" +B = "${WORKDIR}/build" diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.10.bb deleted file mode 100644 index 2e79166b..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.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_2023.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb new file mode 100644 index 00000000..2e79166b --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.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_2022.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.10.bb deleted file mode 100644 index a7dfd8aa..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.10.bb +++ /dev/null @@ -1,32 +0,0 @@ -require u-boot-fslc-common_${PV}.inc - -DESCRIPTION = "U-boot bootloader mxsboot tool" -SECTION = "bootloader" - -DEPENDS = "swig-native bison-native gnutls-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-generic-bsp)" - -BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2023.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2023.01.bb new file mode 100644 index 00000000..a7dfd8aa --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2023.01.bb @@ -0,0 +1,32 @@ +require u-boot-fslc-common_${PV}.inc + +DESCRIPTION = "U-boot bootloader mxsboot tool" +SECTION = "bootloader" + +DEPENDS = "swig-native bison-native gnutls-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-generic-bsp)" + +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/u-boot/u-boot-fslc_2022.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2022.10.bb deleted file mode 100644 index 1953d788..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc_2022.10.bb +++ /dev/null @@ -1,25 +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 python3-setuptools-native" - -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' - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(imx-generic-bsp)" diff --git a/recipes-bsp/u-boot/u-boot-fslc_2023.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2023.01.bb new file mode 100644 index 00000000..1953d788 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc_2023.01.bb @@ -0,0 +1,25 @@ +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 python3-setuptools-native" + +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' + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(imx-generic-bsp)" -- cgit v1.2.3-54-g00ecf