diff options
| author | Tom Hochstein <tom.hochstein@nxp.com> | 2022-07-11 08:41:15 -0500 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-07-11 16:37:28 +0000 |
| commit | 05e0dbeaa1ce496c10a7b7af2e75e9a55c4bd27a (patch) | |
| tree | 0cd0e137169c45a69e21362203c2d35eba42af7f | |
| parent | 24ec778deb92f3ca3372cb5f4df56edcc0e899ed (diff) | |
| download | meta-freescale-backport-1130-to-kirkstone.tar.gz | |
imx-base.inc: Use ??= for PREFERRED_VERSIONbackport-1130-to-kirkstone
The variable values set in meta-freescale with a default value, i.e.
with ?=, can be overridden just once by a user, with =.
Change the PREFERRED_VERSION settings to a weak default value, i.e.
with ??=, so users of meta-freescale are not so limited. When a
variable value is set with a weak default value, the variable can be
overridden by any successively higher priority layer with ??=.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit 5b47898ff939791ab426fff17821aca3476ddd7a)
| -rw-r--r-- | conf/machine/include/imx-base.inc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index bd9e50f7..b7ea61c5 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -412,14 +412,14 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm-nxp-bsp ?= "imx-gst1.0-plugin" | |||
| 412 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin" | 412 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin" |
| 413 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8dx-nxp-bsp ?= "imx-gst1.0-plugin" | 413 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8dx-nxp-bsp ?= "imx-gst1.0-plugin" |
| 414 | 414 | ||
| 415 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ?= "1.20.2.imx" | 415 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.20.2.imx" |
| 416 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ?= "1.20.2.imx" | 416 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.20.2.imx" |
| 417 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ?= "1.20.2.imx" | 417 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.20.2.imx" |
| 418 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ?= "1.20.2.imx" | 418 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.20.2.imx" |
| 419 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ?= "1.20.2" | 419 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.20.2" |
| 420 | PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ?= "1.20.2" | 420 | PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.20.2" |
| 421 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ?= "1.20.2" | 421 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.20.2" |
| 422 | PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ?= "4.4.1" | 422 | PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" |
| 423 | 423 | ||
| 424 | # Determines if the SoC has support for Vivante kernel driver | 424 | # Determines if the SoC has support for Vivante kernel driver |
| 425 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" | 425 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" |
| @@ -447,25 +447,25 @@ PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" | |||
| 447 | PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" | 447 | PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" |
| 448 | PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" | 448 | PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" |
| 449 | 449 | ||
| 450 | PREFERRED_VERSION_weston:imx-nxp-bsp ?= "9.0.0.imx" | 450 | PREFERRED_VERSION_weston:imx-nxp-bsp ??= "9.0.0.imx" |
| 451 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" | 451 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" |
| 452 | 452 | ||
| 453 | PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ?= "1.25.imx" | 453 | PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.25.imx" |
| 454 | PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ?= "1.25.imx" | 454 | PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ??= "1.25.imx" |
| 455 | PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ?= "1.25.imx" | 455 | PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ??= "1.25.imx" |
| 456 | 456 | ||
| 457 | # Use i.MX libdrm Version | 457 | # Use i.MX libdrm Version |
| 458 | PREFERRED_VERSION_libdrm:mx6-nxp-bsp ?= "2.4.109.imx" | 458 | PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.109.imx" |
| 459 | PREFERRED_VERSION_libdrm:mx7-nxp-bsp ?= "2.4.109.imx" | 459 | PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.109.imx" |
| 460 | PREFERRED_VERSION_libdrm:mx8-nxp-bsp ?= "2.4.109.imx" | 460 | PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.109.imx" |
| 461 | 461 | ||
| 462 | # Use i.MX optee Version | 462 | # Use i.MX optee Version |
| 463 | PREFERRED_VERSION_optee-os:mx8-nxp-bsp ?= "3.15.0.imx" | 463 | PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "3.15.0.imx" |
| 464 | PREFERRED_VERSION_optee-client:mx8-nxp-bsp ?= "3.15.0.imx" | 464 | PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "3.15.0.imx" |
| 465 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ?= "3.15.0.imx" | 465 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.15.0.imx" |
| 466 | 466 | ||
| 467 | #Use i.MX opencv Version for mx8 | 467 | #Use i.MX opencv Version for mx8 |
| 468 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ?= "4.5.2.imx" | 468 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.5.2.imx" |
| 469 | 469 | ||
| 470 | # Handle default kernel | 470 | # Handle default kernel |
| 471 | IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc" | 471 | IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc" |