summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-10-17 19:18:49 +0000
committerOtavio Salvador <otavio@ossystems.com.br>2013-10-18 00:01:37 -0300
commit93b3d7dd7cdbbc0a49394cc32d335fb85fd2da74 (patch)
tree9636e8bd951d3d4154aabadbf6ad02e2093f99da /conf
parent4cebb1b53ed439b4d797d6d5c89366cfbc75d7e2 (diff)
downloadmeta-fsl-arm-93b3d7dd7cdbbc0a49394cc32d335fb85fd2da74.tar.gz
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 <raj.khem@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/imx6dlsabreauto.conf1
-rw-r--r--conf/machine/imx6solosabreauto.conf1
-rw-r--r--conf/machine/imx6solosabresd.conf1
-rw-r--r--conf/machine/include/fsl-default-providers.inc1
-rw-r--r--conf/machine/twr-vf65gs10.conf1
5 files changed, 4 insertions, 1 deletions
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"
10KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" 10KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
11 11
12PREFERRED_PROVIDER_u-boot = "u-boot-imx" 12PREFERRED_PROVIDER_u-boot = "u-boot-imx"
13PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
13 14
14UBOOT_CONFIG ??= "sd" 15UBOOT_CONFIG ??= "sd"
15UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard" 16UBOOT_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"
10KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" 10KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
11 11
12PREFERRED_PROVIDER_u-boot = "u-boot-imx" 12PREFERRED_PROVIDER_u-boot = "u-boot-imx"
13PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
13 14
14UBOOT_CONFIG ??= "sd" 15UBOOT_CONFIG ??= "sd"
15UBOOT_CONFIG[sd] = "mx6solosabreauto_config,sdcard" 16UBOOT_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"
10KERNEL_DEVICETREE = "imx6dl-sabresd.dtb" 10KERNEL_DEVICETREE = "imx6dl-sabresd.dtb"
11 11
12PREFERRED_PROVIDER_u-boot = "u-boot-imx" 12PREFERRED_PROVIDER_u-boot = "u-boot-imx"
13PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
13 14
14UBOOT_CONFIG ??= "sd" 15UBOOT_CONFIG ??= "sd"
15UBOOT_CONFIG[sd] = "mx6solosabresd_config,sdcard" 16UBOOT_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 @@
3PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" 3PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
4PREFERRED_PROVIDER_virtual/kernel ?= "linux-imx" 4PREFERRED_PROVIDER_virtual/kernel ?= "linux-imx"
5PREFERRED_PROVIDER_u-boot ?= "u-boot-fslc" 5PREFERRED_PROVIDER_u-boot ?= "u-boot-fslc"
6PREFERRED_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
9SOC_FAMILY = "vf60" 9SOC_FAMILY = "vf60"
10 10
11PREFERRED_PROVIDER_virtual/kernel = "linux-timesys" 11PREFERRED_PROVIDER_virtual/kernel = "linux-timesys"
12PREFERRED_PROVIDER_u-boot = "u-boot-fslc"
13 12
14UBOOT_MACHINE = "vf610twr_config" 13UBOOT_MACHINE = "vf610twr_config"
15 14