machines: Add PREFERRED_PROVIDER for virtual/bootloader

virtual/bootloader is a commonly used target. This patch
adds it for meta-fsl-arm machines.

Other BSP layers have this provider and when using a mutli-machine
distro setup bitbake virtual/bootloader
builds a wrong u-boot for fsl machines

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf b/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf
index bf31b4d069d9677678f6ffb769c07b96006f9332..e0fb1995ba39b9966b71935fccc38e849236c1fa 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf
+++ b/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf
@@ -10,6 +10,7 @@ SOC_FAMILY = "mx6:mx6dl"
 KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard"

diff --git a/meta-fsl-arm/conf/machine/imx6solosabreauto.conf b/meta-fsl-arm/conf/machine/imx6solosabreauto.conf
index c2f5fac17431bed9bbeeb9ce3b4ff9eaa383884b..9d450a462d22c74cef49c784a1cf001d0bc85877 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6solosabreauto.conf
+++ b/meta-fsl-arm/conf/machine/imx6solosabreauto.conf
@@ -10,6 +10,7 @@ SOC_FAMILY = "mx6:mx6s"
 KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6solosabreauto_config,sdcard"

diff --git a/meta-fsl-arm/conf/machine/imx6solosabresd.conf b/meta-fsl-arm/conf/machine/imx6solosabresd.conf
index 325e643d2cba8b9afa4beda7987c09a4344b1ed0..cfc30d2e1cf4d6e9b22ebf0dfc34b3a096de6fcf 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6solosabresd.conf
+++ b/meta-fsl-arm/conf/machine/imx6solosabresd.conf
@@ -10,6 +10,7 @@ SOC_FAMILY = "mx6:mx6s"
 KERNEL_DEVICETREE = "imx6dl-sabresd.dtb"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6solosabresd_config,sdcard"

diff --git a/meta-fsl-arm/conf/machine/include/fsl-default-providers.inc b/meta-fsl-arm/conf/machine/include/fsl-default-providers.inc
index de151896182936aa2090a05800e4d769a36dd32b..e51ea7217323658100052ba9e94f7a19ff1cc37b 100644 (file)
--- a/meta-fsl-arm/conf/machine/include/fsl-default-providers.inc
+++ b/meta-fsl-arm/conf/machine/include/fsl-default-providers.inc
@@ -3,3 +3,4 @@
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-imx"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-fslc"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-fslc"

diff --git a/meta-fsl-arm/conf/machine/twr-vf65gs10.conf b/meta-fsl-arm/conf/machine/twr-vf65gs10.conf
index 00fdff402b40f9c7b6b54b704017c6ad245deec8..f726ffac2e1cff7e11791e705c3a05c2d62f8bef 100644 (file)
--- a/meta-fsl-arm/conf/machine/twr-vf65gs10.conf
+++ b/meta-fsl-arm/conf/machine/twr-vf65gs10.conf
@@ -9,7 +9,6 @@ include conf/machine/include/tune-cortexa5.inc
 SOC_FAMILY = "vf60"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-timesys"
-PREFERRED_PROVIDER_u-boot = "u-boot-fslc"
 
 UBOOT_MACHINE = "vf610twr_config"