From fe53d9fe5c5786d5bff9310e2bdd2f0fccc9e785 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 22 Jun 2023 13:59:24 +0200 Subject: [PATCH] u-boot-dey: re-order ccimx8x deployment steps to avoid errors For the ccimx8x, we changed the order of the steps in do_deploy() from: Deploy -> Rename files -> Move binaries To: Deploy -> Move binaries -> Rename files When it's time to rename the files, they won't be in their original place and the process will fail. Make sure we move the files after they've been renamed to avoid errors. Also, one move operation is enough for all artifacts, so remove the second operation. Signed-off-by: Gabriel Valcazar --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc index 893d655b4..67dcc51fe 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -182,12 +182,11 @@ BOOT_TOOLS:ccmp1 = "u-boot" FIP_UBOOT_HEADER = "ccmp15-dvk" FIP_UBOOT_HEADER:ccmp13 = "ccmp13-dvk" -do_deploy:append:ccimx8x() { +adapt_uboot_filenames:append:ccimx8x() { # Move all U-Boot artifacts to the imx-boot-tools folder # U-Boot images are not bootable on the i.MX8X install -d ${DEPLOYDIR}/${BOOT_TOOLS} mv ${DEPLOYDIR}/u-boot* ${DEPLOYDIR}/${BOOT_TOOLS}/ - mv ${DEPLOYDIR}/${UBOOT_SYMLINK}-* ${DEPLOYDIR}/${BOOT_TOOLS}/ } do_deploy:append:ccimx8m() {