From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Fri, 9 Jul 2021 17:53:37 +0000 (-0500)
Subject: u-boot-mfgtool.inc: Align SPL_IMAGE and SPL_SYMLINK with OE
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=refs%2Fpull%2F825%2Fhead;p=meta-freescale.git

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 <tom.hochstein@nxp.com>
---

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}"