From 9ac912d28959340d7ec01a2f44c3292347712cc0 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 18 Mar 2024 12:01:02 +0100 Subject: [PATCH] ccmp1: remove linux/u-boot functions related to FIT image bootscript copying This logic was fixed in commit e915a14b4b1e457620b2aad8aa821d4b06b7da4a, so we no longer have to manually copy the bootscript to generate FIT images. https://onedigi.atlassian.net/browse/DEL-8946 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb | 9 --------- meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 6 ------ 2 files changed, 15 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb index 84cd41898..3c21e4595 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb @@ -19,15 +19,6 @@ SRC_URI += " \ " install_helper_files() { - # Install UBOOT_ENV_BINARY to datadir, so that kernel can use it - # to include it into the FIT image. - if [ -f "${D}/boot/${UBOOT_ENV_BINARY}" ]; then - install -Dm 0644 ${D}/boot/${UBOOT_ENV_BINARY} ${D}${datadir}/${UBOOT_ENV_IMAGE} - ln -sf ${UBOOT_ENV_IMAGE} ${D}${datadir}/${UBOOT_ENV_BINARY} - else - bbwarn "${D}/boot/${UBOOT_ENV_BINARY} not found" - fi - # Install dtbs from UBOOT_DEVICETREE to datadir, so that kernel # can use it for signing, and kernel will deploy after signs it. if [ -n "${UBOOT_DEVICETREE}" ]; then diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb index 3d078e899..cc65d7536 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb @@ -7,12 +7,6 @@ SRCBRANCH:stm32mpcommon = "v5.15.118/stm/master" SRCREV = "${AUTOREV}" SRCREV:stm32mpcommon = "${AUTOREV}" -do_assemble_fitimage:prepend:ccmp1() { - # Deploy u-boot script to be included into the FIT image - install -d ${STAGING_DIR_HOST}/boot - install -m 0644 ${RECIPE_SYSROOT}/${datadir}/${UBOOT_ENV_BINARY} ${STAGING_DIR_HOST}/boot/ -} - do_assemble_fitimage:append:ccmp1() { # # Step 9: Add public keys to the different U-Boot dtb files