From ee1b9a2fce9aa252b841b47ec1bc5afb2b1cfd70 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 9 Jul 2021 12:45:26 -0500 Subject: u-boot-imx: Fix comment A comment references mkimage but mkimage is no longer deployed. Signed-off-by: Tom Hochstein --- recipes-bsp/u-boot/u-boot-imx_2021.04.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb index 40772e2b0..4ce4e5d2e 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb @@ -8,7 +8,7 @@ require u-boot-imx-common_${PV}.inc PROVIDES += "u-boot" do_deploy_append_mx8m() { - # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary + # 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 -- cgit v1.2.3-54-g00ecf From 999f5d25a266d1d72c942e860fc218b736ddd9af Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 9 Jul 2021 12:47:38 -0500 Subject: u-boot-imx: Fix deploy bug for multiple UBOOT_CONFIG entries A for-loop iterating over entries in UBOOT_CONFIG incorrectly uses the full UBOOT_CONFIG variable in a binary name when the name should be specific to the current entry. Signed-off-by: Tom Hochstein --- recipes-bsp/u-boot/u-boot-imx_2021.04.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb index 4ce4e5d2e..6a279a125 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb @@ -19,7 +19,7 @@ do_deploy_append_mx8m() { then install -d ${DEPLOYDIR}/${BOOT_TOOLS} install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} - install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} + install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${type} fi done unset j -- cgit v1.2.3-54-g00ecf From c72cb38b891cb916d3d71d86bfd0787ba947de2c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 9 Jul 2021 12:53:37 -0500 Subject: 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 91526ad7c..92d055bfb 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}" -- cgit v1.2.3-54-g00ecf