Patchwork [meta-fsl-arm] machine/*: Allow kernel provider override

login
register
mail settings
Submitter Gary Thomas
Date Oct. 30, 2013, 8:40 p.m.
Message ID <1383165619-16344-1-git-send-email-gary@mlbassoc.com>
Download mbox | patch
Permalink /patch/60829/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Gary Thomas - Oct. 30, 2013, 8:40 p.m.
All machine configurations now allow user override of the preferred
kernel provider.

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
 conf/machine/include/imx-base.inc |    2 +-
 conf/machine/include/mxs-base.inc |    2 +-
 conf/machine/twr-vf65gs10.conf    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index beeee5f..3199238 100644
--- a/conf/machine/include/imx-base.inc
+++ b/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/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
index a048f9c..b200899 100644
--- a/conf/machine/include/mxs-base.inc
+++ b/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/conf/machine/twr-vf65gs10.conf b/conf/machine/twr-vf65gs10.conf
index f726ffa..8b6c6d5 100644
--- a/conf/machine/twr-vf65gs10.conf
+++ b/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"