imx6qdlsabre*.conf: Fix UBOOT_CONFIG override for u-boot-imx-mfgtool

Building u-boot-imx-mfgtool for i.MX 6 SABRE results in the following
error:
```
ERROR: Nothing PROVIDES 'u-boot-imx-mfgtool'
u-boot-imx-mfgtool was skipped: The selected UBOOT_CONFIG key ['mfgtool'] has no match in dict_keys(['sd-fslc', 'sd-imx', 'sd-optee-imx', 'sata-imx', 'mfgtool-imx']).
```

The UBOOT_CONFIG key for u-boot-imx-mfgtool is set as `mfgtool`, but the
configuration for NXP BSP uses `mfgtool-imx` because there is not
alignment between u-boot-imx and mainline on the machine to use for
i.MX 6 SABRE boards.

Changing the selected key to mfgtool-imx is difficult, so rework the
original solution so the selection of the machine name is done in a
separate variable and the keys can be kept simple without the `-imx`
adornment.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

2 files changed, 23 insertions, 17 deletions

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index a5ec1249..1bc78604 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -40,22 +40,25 @@ UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 ### u-boot-imx settings ###
 SPL_BINARY:pn-u-boot-imx = ""
 UBOOT_CONFIG:pn-u-boot-imx ??= " \
-    sd-imx \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee-imx', '', d)} \
+    sd \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
 UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
 UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 
+UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig,sdcard"
+UBOOT_CONFIG[eimnor]   = "${UBOOT_CONFIG_MACHINE_NAME}_eimnor_defconfig"
+UBOOT_CONFIG[nand]     = "${UBOOT_CONFIG_MACHINE_NAME}_nand_defconfig,ubifs"
+UBOOT_CONFIG[spinor]   = "${UBOOT_CONFIG_MACHINE_NAME}_spinor_defconfig"
+UBOOT_CONFIG[sata]     = "${UBOOT_CONFIG_MACHINE_NAME}_sata_defconfig"
+UBOOT_CONFIG[mfgtool]  = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig"
+
 # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
 # variants. Change the defconfig to the targeted SoC variant.
-UBOOT_CONFIG[sd-fslc]      = "mx6sabreauto_defconfig,sdcard"
-UBOOT_CONFIG[sd-imx]       = "mx6qpsabreauto_defconfig,sdcard"
-UBOOT_CONFIG[sd-optee-imx] = "mx6qpsabreauto_optee_defconfig,sdcard"
-UBOOT_CONFIG[eimnor-imx]   = "mx6qpsabreauto_eimnor_defconfig"
-UBOOT_CONFIG[nand-imx]     = "mx6qpsabreauto_nand_defconfig,ubifs"
-UBOOT_CONFIG[spinor-imx]   = "mx6qpsabreauto_spinor_defconfig"
-UBOOT_CONFIG[sata-imx]     = "mx6qpsabreauto_sata_defconfig"
-UBOOT_CONFIG[mfgtool-imx]  = "mx6qpsabreauto_defconfig"
+UBOOT_CONFIG_MACHINE_NAME                       = "mx6sabreauto"
+UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx         = "mx6qpsabreauto"
+UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx-mfgtool = "mx6qpsabreauto"
 
 WKS_FILE = " \
     ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 81d1c962..787a2006 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -49,19 +49,22 @@ UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 ### u-boot-imx settings ###
 SPL_BINARY:pn-u-boot-imx = ""
 UBOOT_CONFIG:pn-u-boot-imx ??= " \
-    sd-imx \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee-imx', '', d)} \
+    sd \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
 UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
 UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 
+UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig,sdcard"
+UBOOT_CONFIG[sata]     = "${UBOOT_CONFIG_MACHINE_NAME}_sata_defconfig"
+UBOOT_CONFIG[mfgtool]  = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig"
+
 # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
 # variants. Change the defconfig to the targeted SoC variant.
-UBOOT_CONFIG[sd-fslc]      = "mx6sabresd_defconfig,sdcard"
-UBOOT_CONFIG[sd-imx]       = "mx6qsabresd_defconfig,sdcard"
-UBOOT_CONFIG[sd-optee-imx] = "mx6qsabresd_optee_defconfig,sdcard"
-UBOOT_CONFIG[sata-imx]     = "mx6qsabresd_sata_defconfig"
-UBOOT_CONFIG[mfgtool-imx]  = "mx6qsabresd_defconfig"
+UBOOT_CONFIG_MACHINE_NAME                       = "mx6sabresd"
+UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx         = "mx6qsabresd"
+UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx-mfgtool = "mx6qsabresd"
 
 WKS_FILE = " \
     ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \