From 10394d19f042d80880fd19315796fa8ed3ecc200 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 17 Oct 2013 19:18:49 +0000 Subject: [PATCH] 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 --- meta-fsl-arm/conf/machine/imx6dlsabreauto.conf | 1 + meta-fsl-arm/conf/machine/imx6solosabreauto.conf | 1 + meta-fsl-arm/conf/machine/imx6solosabresd.conf | 1 + meta-fsl-arm/conf/machine/include/fsl-default-providers.inc | 1 + meta-fsl-arm/conf/machine/twr-vf65gs10.conf | 1 - 5 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf b/meta-fsl-arm/conf/machine/imx6dlsabreauto.conf index bf31b4d0..e0fb1995 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 c2f5fac1..9d450a46 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 325e643d..cfc30d2e 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 de151896..e51ea721 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 00fdff40..f726ffac 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" -- 2.40.1