Return-Path: Received: from mail-pb0-f42.google.com (mail-pb0-f42.google.com [209.85.160.42]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id F3D02E01684 for ; Thu, 17 Oct 2013 12:19:11 -0700 (PDT) Received: by mail-pb0-f42.google.com with SMTP id un15so2750444pbc.1 for ; Thu, 17 Oct 2013 12:19:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=YI6zIITjMs2RVViasZgLGjdHCKRAE3X+0rxp1S3cHC4=; b=pecFzotzP3Fak8zRgWMAFIM28bHCBuZXWxA6uW7wX7YFT2zjP/UOPCp2NfA+0csgs6 gdxFQzjiJQ69ApXNqja5fwX+aQ5b8RPOei6+kohuaijgIx7/r06RlBmqRMwNzF+EdW+s qLDA51vqB03LX2sUCDX63dOQFSEgEppzPBO252H9t0wGTV+/M3lvm9TQ8jeyh1r27vO0 ccAbQXJRHwrelIGTdLLAfEIgMKrulYrnjmSFc8nGxvmoUbZNMkQSdTGbN8QcJ32K0ElI 9+J8lr0+hso0mp9QhFq72SKT1FFUUfPZKkwa7snuVnLrKdt9eDqsyUCJRkGCGLv8iY7P wPZQ== X-Received: by 10.68.135.132 with SMTP id ps4mr4554029pbb.171.1382037551115; Thu, 17 Oct 2013 12:19:11 -0700 (PDT) Received: from haswell.gateway.2wire.net (99-57-140-209.lightspeed.sntcca.sbcglobal.net. [99.57.140.209]) by mx.google.com with ESMTPSA id at4sm6804031pbc.30.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Oct 2013 12:19:10 -0700 (PDT) From: Khem Raj To: meta-freescale@yoctoproject.org Date: Thu, 17 Oct 2013 12:18:49 -0700 Message-Id: <1382037529-27210-1-git-send-email-raj.khem@gmail.com> X-Mailer: git-send-email 1.8.3.2 Cc: Khem Raj Subject: [meta-fsl-arm][PATCH V2] machines: Add PREFERRED_PROVIDER for virtual/bootloader X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 19:19:13 -0000 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 --- 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" -- 1.8.3.2