diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2021-04-12 20:59:47 -0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-04-13 17:29:25 -0300 |
| commit | 7e8bafd29eb36a30f39c783a096768f0ba8cca08 (patch) | |
| tree | 4ddb93eae6ce558afde7ad787bad937536d889ea /conf/machine/include | |
| parent | cb3020653421d46fb5308b59da1d9a1e83d99c1a (diff) | |
| download | meta-freescale-7e8bafd29eb36a30f39c783a096768f0ba8cca08.tar.gz | |
imx-base.inc: Fix mfgtool selection for u-boot-fslc
For eventual use of u-boot-fslc as mfgtool flavor, this will need to be
provided as an extra UBOOT_CONFIG thus reusing same provider. This fix
some build errors with external layers.
Fixes: 776932e1 ("Rework the u-boot-fslc and u-boot-imx settings logic")
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/imx-base.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index d52123e2..f12cc276 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -64,9 +64,10 @@ IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc" | |||
| 64 | UBOOT_SUFFIX ?= "${UBOOT_SUFFIX_pn-${IMX_DEFAULT_BOOTLOADER}}" | 64 | UBOOT_SUFFIX ?= "${UBOOT_SUFFIX_pn-${IMX_DEFAULT_BOOTLOADER}}" |
| 65 | 65 | ||
| 66 | IMX_DEFAULT_UBOOTTOOLS = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-tools', 'u-boot-tools', d)}" | 66 | IMX_DEFAULT_UBOOTTOOLS = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-tools', 'u-boot-tools', d)}" |
| 67 | IMX_DEFAULT_MFGTOOL = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-mfgtool', 'u-boot-fslc', d)}" | ||
| 67 | 68 | ||
| 68 | PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" | 69 | PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" |
| 69 | PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_BOOTLOADER}-mfgtool" | 70 | PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_MFGTOOL}" |
| 70 | PREFERRED_PROVIDER_u-boot-tools-native ??= "${IMX_DEFAULT_UBOOTTOOLS}-native" | 71 | PREFERRED_PROVIDER_u-boot-tools-native ??= "${IMX_DEFAULT_UBOOTTOOLS}-native" |
| 71 | PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-${IMX_DEFAULT_UBOOTTOOLS}" | 72 | PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-${IMX_DEFAULT_UBOOTTOOLS}" |
| 72 | PREFERRED_PROVIDER_u-boot-mkimage-native ??= "${IMX_DEFAULT_UBOOTTOOLS}-native" | 73 | PREFERRED_PROVIDER_u-boot-mkimage-native ??= "${IMX_DEFAULT_UBOOTTOOLS}-native" |