From aa613b568e32276fbce6b48e20852e411649d94b Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 14 Aug 2024 08:57:50 -0700 Subject: u-boot-imx: Update to lf-6.6.23-2.0.0 Update the u-boot-imx to the tag lf-6.6.23-2.0.0, that is used in the NXP BSP LF6.6.23_2.0.0. Signed-off-by: Tom Hochstein (cherry picked from commit 8335c55ed1f67ad38062dbc7ed35b8ef41466033) --- recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc | 25 --------- recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc | 25 +++++++++ recipes-bsp/u-boot/u-boot-imx_2023.04.bb | 63 --------------------- recipes-bsp/u-boot/u-boot-imx_2024.04.bb | 71 ++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 88 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc create mode 100644 recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc delete mode 100644 recipes-bsp/u-boot/u-boot-imx_2023.04.bb create mode 100644 recipes-bsp/u-boot/u-boot-imx_2024.04.bb 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 deleted file mode 100644 index e23235627..000000000 --- a/recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc +++ /dev/null @@ -1,25 +0,0 @@ -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-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc new file mode 100644 index 000000000..5d49a8306 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-imx-common_2024.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_v2024.04" +LOCALVERSION ?= "-imx_v2024.04_6.6.23-2.0.0" +SRCREV = "674440bc73e1dd483b84269cccfad89ab40af424" + +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_2023.04.bb b/recipes-bsp/u-boot/u-boot-imx_2023.04.bb deleted file mode 100644 index 0e7c467b9..000000000 --- a/recipes-bsp/u-boot/u-boot-imx_2023.04.bb +++ /dev/null @@ -1,63 +0,0 @@ -# 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-imx_2024.04.bb b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb new file mode 100644 index 000000000..3d03c8349 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb @@ -0,0 +1,71 @@ +# Copyright (C) 2013-2016 Freescale Semiconductor +# Copyright 2018 (C) O.S. Systems Software LTDA. +# Copyright (C) 2017-2024 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 + + # Deploy CRT.* from u-boot for stmm + install -m 0644 ${S}/CRT.* ${DEPLOYDIR} +} + +do_deploy:append:mx93-generic-bsp() { + # Deploy CRT.* from u-boot for stmm + install -m 0644 ${S}/CRT.* ${DEPLOYDIR} +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(mx6-generic-bsp|mx7-generic-bsp|mx8-generic-bsp|mx9-generic-bsp)" -- cgit v1.2.3-54-g00ecf