From 613cc05058e476506a1a2546308141bdd4c81b9d Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 25 Mar 2014 15:47:36 +0100 Subject: 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 The patch was imported from the meta-arm-fsl git server (https://github.com/Freescale/meta-fsl-arm/commit/93b3d7dd7cdbbc0a49394cc32d335fb85fd2da74) and adapted to our machines. --- conf/machine/apalis-t30.conf | 3 +++ conf/machine/colibri-t20.conf | 3 +++ conf/machine/colibri-t30.conf | 3 +++ 3 files changed, 9 insertions(+) (limited to 'conf') diff --git a/conf/machine/apalis-t30.conf b/conf/machine/apalis-t30.conf index adf30fc..340e7a3 100644 --- a/conf/machine/apalis-t30.conf +++ b/conf/machine/apalis-t30.conf @@ -8,6 +8,9 @@ require conf/machine/include/soc-family.inc PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" KERNEL_IMAGETYPE = "uImage" + +PREFERRED_PROVIDER_u-boot = "u-boot-toradex" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" UBOOT_MACHINE = "apalis_t30_config" UBOOT_ENTRYPOINT = "0x82008000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" diff --git a/conf/machine/colibri-t20.conf b/conf/machine/colibri-t20.conf index f2e7418..270d08a 100644 --- a/conf/machine/colibri-t20.conf +++ b/conf/machine/colibri-t20.conf @@ -8,6 +8,9 @@ require conf/machine/include/soc-family.inc PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" KERNEL_IMAGETYPE = "uImage" + +PREFERRED_PROVIDER_u-boot = "u-boot-toradex" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" UBOOT_MACHINE = "colibri_t20_config" UBOOT_ENTRYPOINT = "0x00008000" diff --git a/conf/machine/colibri-t30.conf b/conf/machine/colibri-t30.conf index 3118b0d..ceca229 100644 --- a/conf/machine/colibri-t30.conf +++ b/conf/machine/colibri-t30.conf @@ -8,6 +8,9 @@ require conf/machine/include/soc-family.inc PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" KERNEL_IMAGETYPE = "uImage" + +PREFERRED_PROVIDER_u-boot = "u-boot-toradex" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" UBOOT_MACHINE = "colibri_t30_config" UBOOT_ENTRYPOINT = "0x82008000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" -- cgit v1.2.3