diff options
author | Khem Raj <raj.khem@gmail.com> | 2013-10-17 19:18:49 +0000 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-10-18 00:01:37 -0300 |
commit | 93b3d7dd7cdbbc0a49394cc32d335fb85fd2da74 (patch) | |
tree | 9636e8bd951d3d4154aabadbf6ad02e2093f99da /conf | |
parent | 4cebb1b53ed439b4d797d6d5c89366cfbc75d7e2 (diff) | |
download | meta-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.conf | 1 | ||||
-rw-r--r-- | conf/machine/imx6solosabreauto.conf | 1 | ||||
-rw-r--r-- | conf/machine/imx6solosabresd.conf | 1 | ||||
-rw-r--r-- | conf/machine/include/fsl-default-providers.inc | 1 | ||||
-rw-r--r-- | conf/machine/twr-vf65gs10.conf | 1 |
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" | |||
10 | KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" | 10 | KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" |
11 | 11 | ||
12 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" | 12 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" |
13 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" | ||
13 | 14 | ||
14 | UBOOT_CONFIG ??= "sd" | 15 | UBOOT_CONFIG ??= "sd" |
15 | UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard" | 16 | 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" | |||
10 | KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" | 10 | KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" |
11 | 11 | ||
12 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" | 12 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" |
13 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" | ||
13 | 14 | ||
14 | UBOOT_CONFIG ??= "sd" | 15 | UBOOT_CONFIG ??= "sd" |
15 | UBOOT_CONFIG[sd] = "mx6solosabreauto_config,sdcard" | 16 | 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" | |||
10 | KERNEL_DEVICETREE = "imx6dl-sabresd.dtb" | 10 | KERNEL_DEVICETREE = "imx6dl-sabresd.dtb" |
11 | 11 | ||
12 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" | 12 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" |
13 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" | ||
13 | 14 | ||
14 | UBOOT_CONFIG ??= "sd" | 15 | UBOOT_CONFIG ??= "sd" |
15 | UBOOT_CONFIG[sd] = "mx6solosabresd_config,sdcard" | 16 | 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 @@ | |||
3 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | 3 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" |
4 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-imx" | 4 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-imx" |
5 | PREFERRED_PROVIDER_u-boot ?= "u-boot-fslc" | 5 | PREFERRED_PROVIDER_u-boot ?= "u-boot-fslc" |
6 | 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 | |||
9 | SOC_FAMILY = "vf60" | 9 | SOC_FAMILY = "vf60" |
10 | 10 | ||
11 | PREFERRED_PROVIDER_virtual/kernel = "linux-timesys" | 11 | PREFERRED_PROVIDER_virtual/kernel = "linux-timesys" |
12 | PREFERRED_PROVIDER_u-boot = "u-boot-fslc" | ||
13 | 12 | ||
14 | UBOOT_MACHINE = "vf610twr_config" | 13 | UBOOT_MACHINE = "vf610twr_config" |
15 | 14 | ||