Patchwork [meta-fsl-arm,V2] machines: Add PREFERRED_PROVIDER for virtual/bootloader

login
register
mail settings
Submitter Khem Raj
Date Oct. 17, 2013, 7:18 p.m.
Message ID <1382037529-27210-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/60145/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Khem Raj - Oct. 17, 2013, 7:18 p.m.
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>
---
 conf/machine/imx6dlsabreauto.conf              | 1 +
 conf/machine/imx6solosabreauto.conf            | 1 +
 conf/machine/imx6solosabresd.conf              | 1 +
 conf/machine/include/fsl-default-providers.inc | 1 +
 conf/machine/twr-vf65gs10.conf                 | 1 -
 5 files changed, 4 insertions(+), 1 deletion(-)
Daiane Angolini - Oct. 17, 2013, 7:29 p.m.
On 10/17/2013 04:18 PM, Khem Raj wrote:
> 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

Beautiful!!!

Thanks a lot <3

>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>   conf/machine/imx6dlsabreauto.conf              | 1 +
>   conf/machine/imx6solosabreauto.conf            | 1 +
>   conf/machine/imx6solosabresd.conf              | 1 +
>   conf/machine/include/fsl-default-providers.inc | 1 +
>   conf/machine/twr-vf65gs10.conf                 | 1 -
>   5 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
> index bf31b4d..e0fb199 100644
> --- a/conf/machine/imx6dlsabreauto.conf
> +++ b/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/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
> index c2f5fac..9d450a4 100644
> --- a/conf/machine/imx6solosabreauto.conf
> +++ b/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/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
> index 325e643..cfc30d2 100644
> --- a/conf/machine/imx6solosabresd.conf
> +++ b/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/conf/machine/include/fsl-default-providers.inc b/conf/machine/include/fsl-default-providers.inc
> index de15189..e51ea72 100644
> --- a/conf/machine/include/fsl-default-providers.inc
> +++ b/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/conf/machine/twr-vf65gs10.conf b/conf/machine/twr-vf65gs10.conf
> index 00fdff4..f726ffa 100644
> --- a/conf/machine/twr-vf65gs10.conf
> +++ b/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"
>
>
Otavio Salvador - Oct. 18, 2013, 3:02 a.m.
On Thu, Oct 17, 2013 at 4:18 PM, Khem Raj <raj.khem@gmail.com> wrote:
> 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>

Applied in dora and master.

Patch

diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
index bf31b4d..e0fb199 100644
--- a/conf/machine/imx6dlsabreauto.conf
+++ b/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/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
index c2f5fac..9d450a4 100644
--- a/conf/machine/imx6solosabreauto.conf
+++ b/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/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
index 325e643..cfc30d2 100644
--- a/conf/machine/imx6solosabresd.conf
+++ b/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/conf/machine/include/fsl-default-providers.inc b/conf/machine/include/fsl-default-providers.inc
index de15189..e51ea72 100644
--- a/conf/machine/include/fsl-default-providers.inc
+++ b/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/conf/machine/twr-vf65gs10.conf b/conf/machine/twr-vf65gs10.conf
index 00fdff4..f726ffa 100644
--- a/conf/machine/twr-vf65gs10.conf
+++ b/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"