5 files changed, 4 insertions, 1 deletions

diff --git a/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf b/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf
index bf31b4d06..e0fb1995b 100644
--- 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 c2f5fac17..9d450a462 100644
--- 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 325e643d2..cfc30d2e1 100644
--- 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 de1518961..e51ea7217 100644
--- 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 00fdff402..f726ffac2 100644
--- 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"