From 692f8d9c25ec69abbbfed1e98c478cd2f77f9e5b Mon Sep 17 00:00:00 2001 From: Luan Rafael Carneiro Date: Tue, 16 Apr 2024 15:05:07 -0300 Subject: u-boot-fslc: Bump from v2024.01 to v2024.04 Bump from v2024.01 to v2024.04. This commit creates the following files: - u-boot-fslc-common_2024.04.inc - u-boot-fslc-mxsboot_2024.04.bb - u-boot-fslc_2024.04.bb Signed-off-by: Luan Rafael Carneiro --- recipes-bsp/u-boot/u-boot-fslc-common_2024.01.inc | 19 ---------- recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc | 19 ++++++++++ recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.01.bb | 42 ----------------------- recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb | 42 +++++++++++++++++++++++ recipes-bsp/u-boot/u-boot-fslc_2024.01.bb | 25 -------------- recipes-bsp/u-boot/u-boot-fslc_2024.04.bb | 25 ++++++++++++++ 6 files changed, 86 insertions(+), 86 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2024.01.inc create mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.01.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2024.01.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2024.04.bb diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2024.01.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2024.01.inc deleted file mode 100644 index ee05df89..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2024.01.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 = "9ff224ca0039e9cd22be2ec4b56408cb64d71a87" -SRCBRANCH = "2024.01+fslc" - -PV = "2024.01+git${SRCPV}" - -S = "${WORKDIR}/git" -B = "${WORKDIR}/build" 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-mxsboot_2024.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.01.bb deleted file mode 100644 index b7e4ca76..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.01.bb +++ /dev/null @@ -1,42 +0,0 @@ -require u-boot-fslc-common_${PV}.inc - -DESCRIPTION = "U-boot bootloader mxsboot tool" -SECTION = "bootloader" - -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' - -do_compile () { - 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 -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_2024.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb new file mode 100644 index 00000000..b7e4ca76 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb @@ -0,0 +1,42 @@ +require u-boot-fslc-common_${PV}.inc + +DESCRIPTION = "U-boot bootloader mxsboot tool" +SECTION = "bootloader" + +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' + +do_compile () { + 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 -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_2024.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2024.01.bb deleted file mode 100644 index eba8876a..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc_2024.01.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 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 -# 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_2024.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb new file mode 100644 index 00000000..eba8876a --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc_2024.04.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 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 +# 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