From a26b8420af2b15bd882ff4bad92c1fdc73057f8a Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 22 Feb 2021 14:51:45 +0100 Subject: [PATCH] imx-base: cleanup u-boot-tools There is no u-boot-fslc-tools recipe and thus the PREFERRED_PROVIDER is not available for u-boot-tools. Prevents: | NOTE: Multiple providers are available for u-boot-mkimage-native (u-boot-imx-tools-native, u-boot-tools-native) | Consider defining a PREFERRED_PROVIDER entry to match u-boot-mkimage-native | NOTE: Multiple providers are available for runtime nativesdk-u-boot-mkimage (nativesdk-u-boot-imx-tools, nativesdk-u-boot-tools) | Consider defining a PREFERRED_RPROVIDER entry to match nativesdk-u-boot-mkimage Signed-off-by: Max Krummenacher --- conf/machine/include/imx-base.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 18d886c4..638d423c 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -22,13 +22,14 @@ MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:" IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" IMX_DEFAULT_BOOTLOADER_mx8 = "u-boot-imx" IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" +IMX_DEFAULT_UBOOTTOOLS = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-tools', 'u-boot-tools', d)}" PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_BOOTLOADER}-mfgtool" -PREFERRED_PROVIDER_u-boot-tools-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native" -PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-${IMX_DEFAULT_BOOTLOADER}-tools" -PREFERRED_PROVIDER_u-boot-mkimage-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native" -PREFERRED_PROVIDER_nativesdk-u-boot-mkimage ??= "nativesdk-${IMX_DEFAULT_BOOTLOADER}-tools" +PREFERRED_PROVIDER_u-boot-tools-native ??= "${IMX_DEFAULT_UBOOTTOOLS}-native" +PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-${IMX_DEFAULT_UBOOTTOOLS}" +PREFERRED_PROVIDER_u-boot-mkimage-native ??= "${IMX_DEFAULT_UBOOTTOOLS}-native" +PREFERRED_PROVIDER_nativesdk-u-boot-mkimage ??= "nativesdk-${IMX_DEFAULT_UBOOTTOOLS}" PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" -- 2.40.1