summaryrefslogtreecommitdiffstats
path: root/conf/machine/imx6qdlsabresd.conf
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2022-07-29 12:56:35 -0500
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-07-29 21:21:08 +0000
commitbaa6f9cb8f6cc8040fd1208836cf733535f2da55 (patch)
treea224f11c450b28d315f18a19fa833953bd226b76 /conf/machine/imx6qdlsabresd.conf
parent8b801b824e696babbe1569e8f53657f83694ce71 (diff)
downloadmeta-freescale-baa6f9cb8f6cc8040fd1208836cf733535f2da55.tar.gz
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> (cherry picked from commit d9148f97bc86264d633aa03731fd9ab16bed40c0)
Diffstat (limited to 'conf/machine/imx6qdlsabresd.conf')
-rw-r--r--conf/machine/imx6qdlsabresd.conf17
1 files changed, 10 insertions, 7 deletions
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"
49### u-boot-imx settings ### 49### u-boot-imx settings ###
50SPL_BINARY:pn-u-boot-imx = "" 50SPL_BINARY:pn-u-boot-imx = ""
51UBOOT_CONFIG:pn-u-boot-imx ??= " \ 51UBOOT_CONFIG:pn-u-boot-imx ??= " \
52 sd-imx \ 52 sd \
53 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee-imx', '', d)} \ 53 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
54" 54"
55UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" 55UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
56UBOOT_SUFFIX:pn-u-boot-imx = "imx" 56UBOOT_SUFFIX:pn-u-boot-imx = "imx"
57 57
58UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig,sdcard"
59UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig,sdcard"
60UBOOT_CONFIG[sata] = "${UBOOT_CONFIG_MACHINE_NAME}_sata_defconfig"
61UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig"
62
58# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC 63# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
59# variants. Change the defconfig to the targeted SoC variant. 64# variants. Change the defconfig to the targeted SoC variant.
60UBOOT_CONFIG[sd-fslc] = "mx6sabresd_defconfig,sdcard" 65UBOOT_CONFIG_MACHINE_NAME = "mx6sabresd"
61UBOOT_CONFIG[sd-imx] = "mx6qsabresd_defconfig,sdcard" 66UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx = "mx6qsabresd"
62UBOOT_CONFIG[sd-optee-imx] = "mx6qsabresd_optee_defconfig,sdcard" 67UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx-mfgtool = "mx6qsabresd"
63UBOOT_CONFIG[sata-imx] = "mx6qsabresd_sata_defconfig"
64UBOOT_CONFIG[mfgtool-imx] = "mx6qsabresd_defconfig"
65 68
66WKS_FILE = " \ 69WKS_FILE = " \
67 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ 70 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \