From a004c2655f808b858f7bd4408558f15fc074cc8a Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 9 Jul 2021 12:53:37 -0500 Subject: [PATCH] u-boot-mfgtool.inc: Align SPL_IMAGE and SPL_SYMLINK with OE The deploy task of u-boot-imx-mfgtool fails due to the incorrect addition of an 'spl' sub-folder: ``` install: cannot create regular file '.../tmp/work/imx8mq_evk-fsl-linux/u-boot-imx-mfgtool/2021.04-r0/deploy-u-boot-imx-mfgtool/spl/u-boot-spl.bin-imx8mq-evk-mfgtool-2021.04-r0-mfgtool-2021.04-r0': No such file or directory ``` The customization of SPL_IMAGE and SPL_SYMLINK for mfgtool should just add -mfgtool to the values defined in OE-core. Instead, the base SPL_BINARYNAME is changed to SPL_BINARY, which is why the extra folder 'spl' is in the path. Signed-off-by: Tom Hochstein --- recipes-bsp/u-boot/u-boot-mfgtool.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-mfgtool.inc b/recipes-bsp/u-boot/u-boot-mfgtool.inc index 91526ad7..92d055bf 100644 --- a/recipes-bsp/u-boot/u-boot-mfgtool.inc +++ b/recipes-bsp/u-boot/u-boot-mfgtool.inc @@ -17,5 +17,5 @@ UBOOT_CONFIG = "mfgtool" # Add 'mfgtool' suffix UBOOT_IMAGE = "u-boot-${MACHINE}-mfgtool-${PV}-${PR}.${UBOOT_SUFFIX}" UBOOT_SYMLINK = "u-boot-${MACHINE}-mfgtool.${UBOOT_SUFFIX}" -SPL_IMAGE = "${SPL_BINARY}-${MACHINE}-mfgtool-${PV}-${PR}" -SPL_SYMLINK = "${SPL_BINARY}-mfgtool-${MACHINE}" +SPL_IMAGE = "${SPL_BINARYNAME}-${MACHINE}-mfgtool-${PV}-${PR}" +SPL_SYMLINK = "${SPL_BINARYNAME}-mfgtool-${MACHINE}" -- 2.40.1