Skip to contentSkip to conversation

conf/machine: Make preferred virtual/kernel overridable

PATCH New Daniel D?az 1 participant 1 message Mar 18, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 conf/machine: Make preferred virtual/kernel overridable

A user of the BSP layer may decide to use the machine configuration but a different kernel.

---
v2: Apply the change to all existing configs

 meta-arm-bsp/conf/machine/a5ds.conf          | 2 +-
 meta-arm-bsp/conf/machine/fvp-common/fvp.inc | 2 +-
 meta-arm-bsp/conf/machine/gem5-arm64.conf    | 2 +-
 meta-arm-bsp/conf/machine/juno.conf          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
meta-arm-bsp/conf/machine/a5ds.conf +1 -1
index d220423..136105b 100644
@@ -6,7 +6,7 @@
 
 require conf/machine/include/tune-cortexa5.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-upstream-arm"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-upstream-arm"
 PREFERRED_VERSION_linux-upstream-arm ?= "5.3%"
 KBUILD_DEFCONFIG = "multi_v7_defconfig"
 
meta-arm-bsp/conf/machine/fvp-common/fvp.inc +1 -1
index 6bf33f3..a02890d 100644
@@ -34,7 +34,7 @@ DISK_IMG_PARTITION3_CONTENT = ""
 
 SERIAL_CONSOLES = "115200;ttyAMA0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "4.19%"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
meta-arm-bsp/conf/machine/gem5-arm64.conf +1 -1
index 4775940..e2f58ad 100644
@@ -19,7 +19,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
 
 EXTRA_IMAGEDEPENDS += "virtual/gem5-bootloader"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "4.19%"
 
 
meta-arm-bsp/conf/machine/juno.conf +1 -1
index a728d0a..3b16e6f 100644
@@ -18,7 +18,7 @@ IMAGE_FSTYPES += "tar.bz2 ext4"
 SERIAL_CONSOLES = "115200;ttyAMA0"
 
 # Use kernel provided by linaro (Contains support for SCMi or HDMI)
-PREFERRED_PROVIDER_virtual/kernel = "linux-linaro-arm"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm"
 PREFERRED_VERSION_linux-linaro-arm ?= "4.19%"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
Signature · 1 line
2.20.1