Skip to contentSkip to conversation

machines: Add PREFERRED_PROVIDER for virtual/bootloader

PATCH Applied Khem Raj 3 participants 3 messages Oct 17, 2013 – Oct 18, 2013 Arm i.MX and Layerscape

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v2 1/1 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

---
 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(-)
conf/machine/imx6dlsabreauto.conf +1 -0
index bf31b4d..e0fb199 100644
@@ -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"
conf/machine/imx6solosabreauto.conf +1 -0
index c2f5fac..9d450a4 100644
@@ -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"
conf/machine/imx6solosabresd.conf +1 -0
index 325e643..cfc30d2 100644
@@ -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"
conf/machine/include/fsl-default-providers.inc +1 -0
index de15189..e51ea72 100644
@@ -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"
conf/machine/twr-vf65gs10.conf +0 -1
index 00fdff4..f726ffa 100644
@@ -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"
 
Signature · 1 line
1.8.3.2
#1 lore raw
Quoted 6 lines · Khem Raj

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

Quoted 68 lines
---
  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(-)
conf/machine/imx6dlsabreauto.conf +1 -0
index bf31b4d..e0fb199 100644
@@ -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"
conf/machine/imx6solosabreauto.conf +1 -0
index c2f5fac..9d450a4 100644
@@ -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"
conf/machine/imx6solosabresd.conf +1 -0
index 325e643..cfc30d2 100644
@@ -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"
conf/machine/include/fsl-default-providers.inc +1 -0
index de15189..e51ea72 100644
@@ -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"
conf/machine/twr-vf65gs10.conf +0 -1
index 00fdff4..f726ffa 100644
@@ -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"
 
Signature · 1 line
Daiane
#2 lore raw
In reply to Khem Raj
Quoted 8 lines · Khem Raj

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

Applied in dora and master.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750