From e0b4b8c5df410040e8cef7fbe257f1b9c1513355 Mon Sep 17 00:00:00 2001 From: Christopher Clark Date: Thu, 7 Jan 2021 14:18:26 -0800 Subject: 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 --- conf/machine/include/rpi-base.inc | 2 +- conf/machine/include/rpi-default-providers.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') 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 ?= " \ bcm2710-rpi-cm3.dtb \ " -KERNEL_DEVICETREE ?= " \ +KERNEL_DEVICETREE ??= " \ ${RPI_KERNEL_DEVICETREE} \ ${RPI_KERNEL_DEVICETREE_OVERLAYS} \ " 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 @@ # RaspberryPi BSP default providers -PREFERRED_PROVIDER_virtual/kernel ?= "linux-raspberrypi" +PREFERRED_PROVIDER_virtual/kernel ??= "linux-raspberrypi" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" -- cgit v1.2.3-54-g00ecf