diff options
author | Christopher Clark <christopher.w.clark@gmail.com> | 2021-01-07 14:18:26 -0800 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.com> | 2021-01-12 20:43:49 +0000 |
commit | e0b4b8c5df410040e8cef7fbe257f1b9c1513355 (patch) | |
tree | ed556f67d007eb0586a0bef45dd699b423884864 /conf | |
parent | a7cc636d4ef0ed7ddabf5785463dbb5c79633b1e (diff) | |
download | meta-raspberrypi-e0b4b8c5df410040e8cef7fbe257f1b9c1513355.tar.gz |
machine: use weak default for kernel and KERNEL_DEVICETREE settings
To allow other layers to easily provide a default kernel preference to
use with the Raspberry Pi MACHINEs, switch to use the ??= assignment
operator for setting the default kernel and the device tree value in
this layer.
This change is motivated by enabling Xen support in meta-virtualization
to use the raspberrypi4-64 MACHINE definition from this layer with the
Yocto Linux kernels.
Signed-off-by: Christopher Clark <christopher.w.clark@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/include/rpi-base.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/rpi-default-providers.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index 18368c6..f537188 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc | |||
@@ -57,7 +57,7 @@ RPI_KERNEL_DEVICETREE ?= " \ | |||
57 | bcm2710-rpi-cm3.dtb \ | 57 | bcm2710-rpi-cm3.dtb \ |
58 | " | 58 | " |
59 | 59 | ||
60 | KERNEL_DEVICETREE ?= " \ | 60 | KERNEL_DEVICETREE ??= " \ |
61 | ${RPI_KERNEL_DEVICETREE} \ | 61 | ${RPI_KERNEL_DEVICETREE} \ |
62 | ${RPI_KERNEL_DEVICETREE_OVERLAYS} \ | 62 | ${RPI_KERNEL_DEVICETREE_OVERLAYS} \ |
63 | " | 63 | " |
diff --git a/conf/machine/include/rpi-default-providers.inc b/conf/machine/include/rpi-default-providers.inc index 181b936..c02d248 100644 --- a/conf/machine/include/rpi-default-providers.inc +++ b/conf/machine/include/rpi-default-providers.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | # RaspberryPi BSP default providers | 1 | # RaspberryPi BSP default providers |
2 | 2 | ||
3 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-raspberrypi" | 3 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-raspberrypi" |
4 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 4 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
5 | PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" | 5 | PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" |
6 | PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" | 6 | PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" |