From: Gary Thomas <gary@mlbassoc.com>
Date: Wed, 30 Oct 2013 20:40:19 +0000 (+0000)
Subject: machine/*: Allow kernel provider override
X-Git-Tag: 2.1~1150
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8e017e8060b9dc94cc4e3f0b28a5c64eed39cf7f;p=meta-freescale.git

machine/*: Allow kernel provider override

All machine configurations now allow user override of the preferred
kernel provider.

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---

diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc
index beeee5fc..31992380 100644
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@ -88,7 +88,7 @@ PREFERRED_PROVIDER_virtual/libgl_mx6 ?= "gpu-viv-bin-mx6q"
 PREFERRED_PROVIDER_virtual/libgles1_mx6 ?= "gpu-viv-bin-mx6q"
 PREFERRED_PROVIDER_virtual/libgles2_mx6 ?= "gpu-viv-bin-mx6q"
 
-PREFERRED_PROVIDER_virtual/kernel_mx3 = "linux-fslc"
+PREFERRED_PROVIDER_virtual/kernel_mx3 ?= "linux-fslc"
 
 EXTRA_IMAGEDEPENDS = "u-boot"
 
diff --git a/meta-fsl-arm/conf/machine/include/mxs-base.inc b/meta-fsl-arm/conf/machine/include/mxs-base.inc
index a048f9c7..b200899d 100644
--- a/meta-fsl-arm/conf/machine/include/mxs-base.inc
+++ b/meta-fsl-arm/conf/machine/include/mxs-base.inc
@@ -9,7 +9,7 @@ include conf/machine/include/tune-arm926ejs.inc
 
 SOC_FAMILY = "mxs"
 
-PREFERRED_PROVIDER_virtual/kernel_mx23 = "linux-fslc"
+PREFERRED_PROVIDER_virtual/kernel_mx23 ?= "linux-fslc"
 
 UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_MAKE_TARGET = "u-boot.sb"
diff --git a/meta-fsl-arm/conf/machine/twr-vf65gs10.conf b/meta-fsl-arm/conf/machine/twr-vf65gs10.conf
index f726ffac..8b6c6d5b 100644
--- a/meta-fsl-arm/conf/machine/twr-vf65gs10.conf
+++ b/meta-fsl-arm/conf/machine/twr-vf65gs10.conf
@@ -8,7 +8,7 @@ include conf/machine/include/tune-cortexa5.inc
 
 SOC_FAMILY = "vf60"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-timesys"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-timesys"
 
 UBOOT_MACHINE = "vf610twr_config"