3 files changed, 8 insertions, 8 deletions

diff --git a/meta-fsl-arm/conf/machine/include/fsl-default-providers.inc b/meta-fsl-arm/conf/machine/include/fsl-default-providers.inc
deleted file mode 100644
index c738d495..00000000
--- a/meta-fsl-arm/conf/machine/include/fsl-default-providers.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# Freescale BSP default providers
-
-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/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc
index 51625ebd..fc50ee13 100644
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@ -2,11 +2,12 @@
 
 include conf/machine/include/fsl-default-settings.inc
 include conf/machine/include/fsl-default-versions.inc
-include conf/machine/include/fsl-default-providers.inc
 
 include conf/machine/include/soc-family.inc
 
 # Set specific make target and binary suffix
+PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc"
+PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc"
 UBOOT_MAKE_TARGET = "u-boot.imx"
 UBOOT_SUFFIX ?= "imx"
 
@@ -18,6 +19,7 @@ UBOOT_ENTRYPOINT_mx6sl = "0x80008000"
 UBOOT_ENTRYPOINT_mx6sx = "0x80008000"
 UBOOT_ENTRYPOINT_vf = "0x80008000"
 
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER_DRIVER = "xf86-video-fbdev"
 XSERVER_DRIVER_mx5 = "xf86-video-imxfb"
 XSERVER_DRIVER_mx6 = "xf86-video-imxfb-vivante"
@@ -107,6 +109,7 @@ PREFERRED_PROVIDER_virtual/libgl_mx6sx ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgl_mx6sl ?= "mesa"
 PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv"
 
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-imx"
 PREFERRED_PROVIDER_virtual/kernel_mx3 ?= "linux-fslc"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
diff --git a/meta-fsl-arm/conf/machine/include/mxs-base.inc b/meta-fsl-arm/conf/machine/include/mxs-base.inc
index a6c34e18..8632f15e 100644
--- a/meta-fsl-arm/conf/machine/include/mxs-base.inc
+++ b/meta-fsl-arm/conf/machine/include/mxs-base.inc
@@ -2,19 +2,22 @@
 
 include conf/machine/include/fsl-default-settings.inc
 include conf/machine/include/fsl-default-versions.inc
-include conf/machine/include/fsl-default-providers.inc
 
 include conf/machine/include/soc-family.inc
 include conf/machine/include/tune-arm926ejs.inc
 
 SOC_FAMILY = "mxs"
 
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-imx"
 PREFERRED_PROVIDER_virtual/kernel_mx23 ?= "linux-fslc"
 
+PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc"
+PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc"
 UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_MAKE_TARGET = "u-boot.sb"
 UBOOT_SUFFIX = "sb"
 
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-video-fbdev"