From c3de76272c3db540d1c4e45c3bc908673d81f07e Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 11 Sep 2024 09:46:22 -0700 Subject: boot: Fix UUU tagging, extend to fslc Using the UUU-tagged bootloader image directly with UUU can cause UUU to hang. The bootloader image is split on a certain transmit size, and the hang occurs if the tag does not fit with the final bytes of the bootloader image and must be split into a new transmit package. The UUU tag is needed by UUU only in the SD Card image file itself so that UUU can find the end of the boot partition. Rework the design so the default bootloader and the default imx-boot binaries are not tagged. Also, extend the UUU tagging to fslc so it can gain the same benefit. Fixes: https://github.com/Freescale/meta-freescale/pull/1762 Fixes: https://github.com/nxp-imx/mfgtools/issues/416 Co-authored-by: Otavio Salvador Signed-off-by: Tom Hochstein --- recipes-bsp/u-boot/u-boot-fslc_2024.07.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'recipes-bsp/u-boot/u-boot-fslc_2024.07.bb') diff --git a/recipes-bsp/u-boot/u-boot-fslc_2024.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2024.07.bb index eba8876aa..4dc698219 100644 --- a/recipes-bsp/u-boot/u-boot-fslc_2024.07.bb +++ b/recipes-bsp/u-boot/u-boot-fslc_2024.07.bb @@ -6,8 +6,6 @@ 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" @@ -21,5 +19,8 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ HOSTLDFLAGS="${BUILD_LDFLAGS}" \ HOSTSTRIP=true' +inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')} +inherit uuu_bootloader_tag + PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(imx-generic-bsp)" -- cgit v1.2.3-54-g00ecf