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

login
register
mail settings
Submitter Gary Thomas
Date Oct. 31, 2013, 2:59 p.m.
Message ID <1383231569-4709-1-git-send-email-gary@mlbassoc.com>
Download mbox | patch
Permalink /patch/60905/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Gary Thomas - Oct. 31, 2013, 2:59 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/cfa10036.inc |    2 +-
 conf/machine/m28evk.conf          |    2 +-
 conf/machine/m53evk.conf          |    2 +-
 conf/machine/nitrogen6x-lite.conf |    2 +-
 conf/machine/wandboard-dual.conf  |    2 +-
 conf/machine/wandboard-quad.conf  |    2 +-
 conf/machine/wandboard-solo.conf  |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

Patch

diff --git a/conf/machine/include/cfa10036.inc b/conf/machine/include/cfa10036.inc
index b2916f5..95c8f4a 100644
--- a/conf/machine/include/cfa10036.inc
+++ b/conf/machine/include/cfa10036.inc
@@ -4,7 +4,7 @@  include conf/machine/include/mxs-base.inc
 
 SOC_FAMILY = "mxs:mx28:cfa10036"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-cfa"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-cfa"
 
 IMAGE_BOOTLOADER = "barebox"
 BAREBOX_BINARY = "barebox"
diff --git a/conf/machine/m28evk.conf b/conf/machine/m28evk.conf
index ec8af0e..abe7c03 100644
--- a/conf/machine/m28evk.conf
+++ b/conf/machine/m28evk.conf
@@ -9,7 +9,7 @@  SOC_FAMILY = "mxs:mx28"
 
 UBOOT_MACHINE = "m28evk_config"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-fslc"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc"
 KERNEL_IMAGETYPE = "uImage"
 KERNEL_DEVICETREE = "imx28-m28evk.dtb"
 
diff --git a/conf/machine/m53evk.conf b/conf/machine/m53evk.conf
index 33f9cef..e2fbc56 100644
--- a/conf/machine/m53evk.conf
+++ b/conf/machine/m53evk.conf
@@ -10,7 +10,7 @@  SOC_FAMILY = "mx5:mx53"
 
 UBOOT_MACHINE = "m53evk_config"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-denx"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-denx"
 
 KERNEL_IMAGETYPE = "uImage"
 KERNEL_DEVICETREE = "imx53-m53evk.dtb"
diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
index ff58715..39578c1 100644
--- a/conf/machine/nitrogen6x-lite.conf
+++ b/conf/machine/nitrogen6x-lite.conf
@@ -9,7 +9,7 @@  include conf/machine/include/tune-cortexa9.inc
 SOC_FAMILY = "mx6:mx6s"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
-PREFERRED_PROVIDER_virtual/kernel = "linux-boundary"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-boundary"
 
 # Use SPI NOR U-Boot by default
 IMAGE_BOOTLOADER ?= ""
diff --git a/conf/machine/wandboard-dual.conf b/conf/machine/wandboard-dual.conf
index eaee17b..3526790 100644
--- a/conf/machine/wandboard-dual.conf
+++ b/conf/machine/wandboard-dual.conf
@@ -8,7 +8,7 @@  include conf/machine/include/tune-cortexa9.inc
 
 SOC_FAMILY = "mx6:mx6dl:wandboard"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard"
 
 UBOOT_MACHINE = "wandboard_dl_config"
 
diff --git a/conf/machine/wandboard-quad.conf b/conf/machine/wandboard-quad.conf
index 4f32590..578dd0d 100644
--- a/conf/machine/wandboard-quad.conf
+++ b/conf/machine/wandboard-quad.conf
@@ -8,7 +8,7 @@  include conf/machine/include/tune-cortexa9.inc
 
 SOC_FAMILY = "mx6:mx6q:wandboard"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard"
 
 UBOOT_MACHINE = "wandboard_quad_config"
 
diff --git a/conf/machine/wandboard-solo.conf b/conf/machine/wandboard-solo.conf
index 970e650..aad7876 100644
--- a/conf/machine/wandboard-solo.conf
+++ b/conf/machine/wandboard-solo.conf
@@ -8,7 +8,7 @@  include conf/machine/include/tune-cortexa9.inc
 
 SOC_FAMILY = "mx6:mx6s:wandboard"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard"
 
 UBOOT_MACHINE = "wandboard_solo_config"