diff options
Diffstat (limited to 'conf/machine/include/imx-base.inc')
| -rw-r--r-- | conf/machine/include/imx-base.inc | 78 |
1 files changed, 43 insertions, 35 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index df3773d2e..d709b3129 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -95,6 +95,7 @@ UBOOT_ENTRYPOINT:mx7-generic-bsp ?= "0x80008000" | |||
| 95 | UBOOT_ENTRYPOINT:mx7ulp-generic-bsp ?= "0x60008000" | 95 | UBOOT_ENTRYPOINT:mx7ulp-generic-bsp ?= "0x60008000" |
| 96 | UBOOT_ENTRYPOINT:mx8m-generic-bsp ?= "0x40480000" | 96 | UBOOT_ENTRYPOINT:mx8m-generic-bsp ?= "0x40480000" |
| 97 | UBOOT_ENTRYPOINT:mx93-generic-bsp ?= "0x80400000" | 97 | UBOOT_ENTRYPOINT:mx93-generic-bsp ?= "0x80400000" |
| 98 | UBOOT_ENTRYPOINT:mx943-generic-bsp ?= "0x80400000" | ||
| 98 | UBOOT_ENTRYPOINT:vf-generic-bsp ?= "0x80008000" | 99 | UBOOT_ENTRYPOINT:vf-generic-bsp ?= "0x80008000" |
| 99 | 100 | ||
| 100 | # Some SoC can utilize the boot container provided by U-Boot, | 101 | # Some SoC can utilize the boot container provided by U-Boot, |
| @@ -106,6 +107,9 @@ UBOOT_PROVIDES_BOOT_CONTAINER = "0" | |||
| 106 | # IMX_DEFAULT_BOOTLOADER. | 107 | # IMX_DEFAULT_BOOTLOADER. |
| 107 | UBOOT_PROVIDES_BOOT_CONTAINER:mx8m-generic-bsp = "${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', '0', '1')}" | 108 | UBOOT_PROVIDES_BOOT_CONTAINER:mx8m-generic-bsp = "${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', '0', '1')}" |
| 108 | 109 | ||
| 110 | # i.MX95 mainline U-Boot uses binman to assemble the boot container. | ||
| 111 | UBOOT_PROVIDES_BOOT_CONTAINER:mx95-mainline-bsp = "1" | ||
| 112 | |||
| 109 | # Trusted Firmware for Cortex-A (TF-A) can have different providers, either | 113 | # Trusted Firmware for Cortex-A (TF-A) can have different providers, either |
| 110 | # from upstream or from NXP downstream fork. Below variable defines which TF-A | 114 | # from upstream or from NXP downstream fork. Below variable defines which TF-A |
| 111 | # shall be taken into the build, and will be integrated into runtime image. | 115 | # shall be taken into the build, and will be integrated into runtime image. |
| @@ -169,6 +173,7 @@ DEFAULTTUNE:mx8x-generic-bsp ?= "cortexa35-crypto" | |||
| 169 | DEFAULTTUNE:mx8ulp-generic-bsp ?= "cortexa35-crypto" | 173 | DEFAULTTUNE:mx8ulp-generic-bsp ?= "cortexa35-crypto" |
| 170 | DEFAULTTUNE:mx91-generic-bsp ?= "cortexa55" | 174 | DEFAULTTUNE:mx91-generic-bsp ?= "cortexa55" |
| 171 | DEFAULTTUNE:mx93-generic-bsp ?= "cortexa55" | 175 | DEFAULTTUNE:mx93-generic-bsp ?= "cortexa55" |
| 176 | DEFAULTTUNE:mx94-generic-bsp ?= "cortexa55" | ||
| 172 | DEFAULTTUNE:mx95-generic-bsp ?= "cortexa55" | 177 | DEFAULTTUNE:mx95-generic-bsp ?= "cortexa55" |
| 173 | 178 | ||
| 174 | INHERIT += "machine-overrides-extender" | 179 | INHERIT += "machine-overrides-extender" |
| @@ -227,6 +232,7 @@ MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxd | |||
| 227 | 232 | ||
| 228 | MACHINEOVERRIDES_EXTENDER:mx91:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:mx9-generic-bsp:mx9-nxp-bsp:mx91-generic-bsp:mx91-nxp-bsp" | 233 | MACHINEOVERRIDES_EXTENDER:mx91:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:mx9-generic-bsp:mx9-nxp-bsp:mx91-generic-bsp:mx91-nxp-bsp" |
| 229 | MACHINEOVERRIDES_EXTENDER:mx93:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp" | 234 | MACHINEOVERRIDES_EXTENDER:mx93:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp" |
| 235 | MACHINEOVERRIDES_EXTENDER:mx943:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx94-generic-bsp:mx94-nxp-bsp:mx943-generic-bsp:mx943-nxp-bsp" | ||
| 230 | MACHINEOVERRIDES_EXTENDER:mx95:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxmali:imxgpu2d:imxgpu3d:mx9-generic-bsp:mx9-nxp-bsp:mx95-generic-bsp:mx95-nxp-bsp" | 236 | MACHINEOVERRIDES_EXTENDER:mx95:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxmali:imxgpu2d:imxgpu3d:mx9-generic-bsp:mx9-nxp-bsp:mx95-generic-bsp:mx95-nxp-bsp" |
| 231 | 237 | ||
| 232 | ####### | 238 | ####### |
| @@ -272,6 +278,7 @@ MACHINEOVERRIDES_EXTENDER:mx8ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainlin | |||
| 272 | 278 | ||
| 273 | MACHINEOVERRIDES_EXTENDER:mx91:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx91-generic-bsp:mx91-mainline-bsp" | 279 | MACHINEOVERRIDES_EXTENDER:mx91:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx91-generic-bsp:mx91-mainline-bsp" |
| 274 | MACHINEOVERRIDES_EXTENDER:mx93:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx93-generic-bsp:mx93-mainline-bsp" | 280 | MACHINEOVERRIDES_EXTENDER:mx93:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx93-generic-bsp:mx93-mainline-bsp" |
| 281 | MACHINEOVERRIDES_EXTENDER:mx943:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx94-generic-bsp:mx94-mainline-bsp:mx943-generic-bsp:mx943-mainline-bsp" | ||
| 275 | MACHINEOVERRIDES_EXTENDER:mx95:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx95-generic-bsp:mx95-mainline-bsp" | 282 | MACHINEOVERRIDES_EXTENDER:mx95:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx95-generic-bsp:mx95-mainline-bsp" |
| 276 | 283 | ||
| 277 | MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ | 284 | MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ |
| @@ -305,6 +312,7 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ | |||
| 305 | mx8ulp \ | 312 | mx8ulp \ |
| 306 | mx91 \ | 313 | mx91 \ |
| 307 | mx93 \ | 314 | mx93 \ |
| 315 | mx943 \ | ||
| 308 | mx95 \ | 316 | mx95 \ |
| 309 | " | 317 | " |
| 310 | 318 | ||
| @@ -335,6 +343,7 @@ MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8xl" | |||
| 335 | MACHINE_SOCARCH_SUFFIX:mx8ulp-nxp-bsp = "-mx8ulp" | 343 | MACHINE_SOCARCH_SUFFIX:mx8ulp-nxp-bsp = "-mx8ulp" |
| 336 | MACHINE_SOCARCH_SUFFIX:mx91-nxp-bsp = "-mx91" | 344 | MACHINE_SOCARCH_SUFFIX:mx91-nxp-bsp = "-mx91" |
| 337 | MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp = "-mx93" | 345 | MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp = "-mx93" |
| 346 | MACHINE_SOCARCH_SUFFIX:mx943-nxp-bsp = "-mx943" | ||
| 338 | MACHINE_SOCARCH_SUFFIX:mx95-nxp-bsp = "-mx95" | 347 | MACHINE_SOCARCH_SUFFIX:mx95-nxp-bsp = "-mx95" |
| 339 | 348 | ||
| 340 | # For Mainline we use a single SoC suffix as we don't have different build options | 349 | # For Mainline we use a single SoC suffix as we don't have different build options |
| @@ -414,6 +423,7 @@ IMX_EXTRA_FIRMWARE:mx8x-generic-bsp = "imx-sc-firmware imx-seco" | |||
| 414 | IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-ele-imx" | 423 | IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-ele-imx" |
| 415 | IMX_EXTRA_FIRMWARE:mx91-generic-bsp = "imx-boot-firmware-files firmware-ele-imx" | 424 | IMX_EXTRA_FIRMWARE:mx91-generic-bsp = "imx-boot-firmware-files firmware-ele-imx" |
| 416 | IMX_EXTRA_FIRMWARE:mx93-generic-bsp = "imx-boot-firmware-files firmware-ele-imx" | 425 | IMX_EXTRA_FIRMWARE:mx93-generic-bsp = "imx-boot-firmware-files firmware-ele-imx" |
| 426 | IMX_EXTRA_FIRMWARE:mx943-nxp-bsp = "imx-boot-firmware-files firmware-ele-imx virtual/imx-system-manager virtual/imx-oei" | ||
| 417 | PREFERRED_PROVIDER_virtual/imx-system-manager ??= "imx-system-manager" | 427 | PREFERRED_PROVIDER_virtual/imx-system-manager ??= "imx-system-manager" |
| 418 | PREFERRED_PROVIDER_virtual/imx-oei ??= "imx-oei" | 428 | PREFERRED_PROVIDER_virtual/imx-oei ??= "imx-oei" |
| 419 | IMX_EXTRA_FIRMWARE:mx95-generic-bsp = "imx-boot-firmware-files firmware-ele-imx virtual/imx-system-manager virtual/imx-oei" | 429 | IMX_EXTRA_FIRMWARE:mx95-generic-bsp = "imx-boot-firmware-files firmware-ele-imx virtual/imx-system-manager virtual/imx-oei" |
| @@ -455,25 +465,12 @@ MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', | |||
| 455 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}" | 465 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}" |
| 456 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}" | 466 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}" |
| 457 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}" | 467 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}" |
| 458 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'firmware-nxp-wifi-bcm4359-pcie', '', d)}" | ||
| 459 | 468 | ||
| 460 | # Extra NXP Wi-Fi and Bluetooth driver firmware and driver | 469 | # Extra NXP Wi-Fi and Bluetooth driver firmware and driver |
| 461 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8801-sdio', 'firmware-nxp-wifi-nxp8801-sdio', '', d)}" | ||
| 462 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8801-sdio', 'kernel-module-nxp-wlan', '', d)}" | ||
| 463 | |||
| 464 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'firmware-nxp-wifi-nxp8987-sdio', '', d)}" | 470 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'firmware-nxp-wifi-nxp8987-sdio', '', d)}" |
| 465 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'kernel-module-nxp-wlan', '', d)}" | 471 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'kernel-module-nxp-wlan', '', d)}" |
| 466 | PREFERRED_RPROVIDER_linux-firmware-nxp8987-sdio = "firmware-nxp-wifi" | 472 | PREFERRED_RPROVIDER_linux-firmware-nxp8987-sdio = "firmware-nxp-wifi" |
| 467 | 473 | ||
| 468 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'firmware-nxp-wifi-nxp8997-pcie', '', d)}" | ||
| 469 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'kernel-module-nxp-wlan', '', d)}" | ||
| 470 | PREFERRED_RPROVIDER_linux-firmware-nxp8997-common = "firmware-nxp-wifi" | ||
| 471 | PREFERRED_RPROVIDER_linux-firmware-nxp8997-pcie = "firmware-nxp-wifi" | ||
| 472 | |||
| 473 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'firmware-nxp-wifi-nxp8997-sdio', '', d)}" | ||
| 474 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'kernel-module-nxp-wlan', '', d)}" | ||
| 475 | PREFERRED_RPROVIDER_linux-firmware-nxp8997-sdio = "firmware-nxp-wifi" | ||
| 476 | |||
| 477 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'firmware-nxp-wifi-nxp9098-pcie', '', d)}" | 474 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'firmware-nxp-wifi-nxp9098-pcie', '', d)}" |
| 478 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'kernel-module-nxp-wlan', '', d)}" | 475 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'kernel-module-nxp-wlan', '', d)}" |
| 479 | PREFERRED_RPROVIDER_linux-firmware-nxp9098-common = "firmware-nxp-wifi" | 476 | PREFERRED_RPROVIDER_linux-firmware-nxp9098-common = "firmware-nxp-wifi" |
| @@ -507,6 +504,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \ | |||
| 507 | # ELE extra Firmware | 504 | # ELE extra Firmware |
| 508 | SECOEXT_FIRMWARE_NAME ?= "UNDEFINED" | 505 | SECOEXT_FIRMWARE_NAME ?= "UNDEFINED" |
| 509 | SECOEXT_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}ext-ahab-container.img" | 506 | SECOEXT_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}ext-ahab-container.img" |
| 507 | SECOEXT_FIRMWARE_NAME:mx943-generic-bsp ?= "mx943${IMX_SOC_REV_LOWER}runtime-ahab-container.img" | ||
| 510 | 508 | ||
| 511 | # GStreamer 1.0 plugins | 509 | # GStreamer 1.0 plugins |
| 512 | MACHINE_GSTREAMER_1_0_PLUGIN ?= "" | 510 | MACHINE_GSTREAMER_1_0_PLUGIN ?= "" |
| @@ -528,24 +526,28 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin" | |||
| 528 | MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" | 526 | MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" |
| 529 | 527 | ||
| 530 | # GStreamer forked recipes | 528 | # GStreamer forked recipes |
| 531 | PREFERRED_VERSION_gstreamer1.0:imx-nxp-bsp ??= "1.26.0.imx" | 529 | PREFERRED_VERSION_gstreamer1.0:imx-nxp-bsp ??= "1.26.6.imx" |
| 532 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx-nxp-bsp ??= "1.26.0.imx" | 530 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx-nxp-bsp ??= "1.26.6.imx" |
| 533 | PREFERRED_VERSION_gstreamer1.0-plugins-base:imx-nxp-bsp ??= "1.26.0.imx" | 531 | PREFERRED_VERSION_gstreamer1.0-plugins-base:imx-nxp-bsp ??= "1.26.6.imx" |
| 534 | PREFERRED_VERSION_gstreamer1.0-plugins-good:imx-nxp-bsp ??= "1.26.0.imx" | 532 | PREFERRED_VERSION_gstreamer1.0-plugins-good:imx-nxp-bsp ??= "1.26.6.imx" |
| 535 | 533 | ||
| 536 | 534 | ||
| 537 | # GStreamer copied recipes | 535 | # GStreamer copied recipes |
| 538 | PREFERRED_VERSION_gst-devtools:imx-nxp-bsp ??= "1.26.0.imx" | 536 | PREFERRED_VERSION_gst-devtools:imx-nxp-bsp ??= "1.26.6" |
| 539 | PREFERRED_VERSION_gst-examples:imx-nxp-bsp ??= "1.24.7.imx" | 537 | PREFERRED_VERSION_gst-examples:imx-nxp-bsp ??= "1.26.6" |
| 540 | PREFERRED_VERSION_gstreamer1.0-libav:imx-nxp-bsp ??= "1.26.0.imx" | 538 | PREFERRED_VERSION_gstreamer1.0-libav:imx-nxp-bsp ??= "1.26.6" |
| 541 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:imx-nxp-bsp ??= "1.26.0.imx" | 539 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:imx-nxp-bsp ??= "1.26.6" |
| 542 | PREFERRED_VERSION_gstreamer1.0-python:imx-nxp-bsp ??= "1.26.0.imx" | 540 | PREFERRED_VERSION_gstreamer1.0-python:imx-nxp-bsp ??= "1.26.6" |
| 543 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:imx-nxp-bsp ??= "1.26.0.imx" | 541 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:imx-nxp-bsp ??= "1.26.6" |
| 544 | PREFERRED_VERSION_gstreamer1.0-vaapi:imx-nxp-bsp ??= "1.26.0.imx" | 542 | PREFERRED_VERSION_gstreamer1.0-vaapi:imx-nxp-bsp ??= "1.26.6" |
| 545 | 543 | ||
| 546 | # GStreamer downgrade ffmpeg | 544 | # Use libcamera fork for certain SOCs |
| 547 | PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" | 545 | PREFERRED_VERSION_libcamera ??= "${PREFERRED_VERSION_LIBCAMERA_IMX}" |
| 548 | PREFERRED_VERSION_ffmpeg:mx9-nxp-bsp ??= "4.4.1" | 546 | PREFERRED_VERSION_LIBCAMERA_IMX = "" |
| 547 | PREFERRED_VERSION_LIBCAMERA_IMX:mx95-nxp-bsp = "0.6.0.imx" | ||
| 548 | PREFERRED_VERSION_LIBCAMERA_IMX:mx8mm-nxp-bsp = "0.6.0.imx" | ||
| 549 | PREFERRED_VERSION_LIBCAMERA_IMX:mx8ulp-nxp-bsp = "0.6.0.imx" | ||
| 550 | PREFERRED_VERSION_LIBCAMERA_IMX:mx8mq-nxp-bsp = "0.6.0.imx" | ||
| 549 | 551 | ||
| 550 | # Determines if the SoC has support for Vivante kernel driver | 552 | # Determines if the SoC has support for Vivante kernel driver |
| 551 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" | 553 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" |
| @@ -573,12 +575,18 @@ PREFERRED_PROVIDER_opencl-headers:imxviv ?= "imx-gpu-viv" | |||
| 573 | PREFERRED_PROVIDER_opencl-icd-loader:imxviv ?= "imx-gpu-viv" | 575 | PREFERRED_PROVIDER_opencl-icd-loader:imxviv ?= "imx-gpu-viv" |
| 574 | PREFERRED_PROVIDER_virtual/libopencl1:imxviv ?= "imx-gpu-viv" | 576 | PREFERRED_PROVIDER_virtual/libopencl1:imxviv ?= "imx-gpu-viv" |
| 575 | 577 | ||
| 578 | # Set preferred OpenCL ICD runtime | ||
| 579 | PREFERRED_RPROVIDER_virtual-opencl-icd ?= "libopencl-mesa" | ||
| 580 | PREFERRED_RPROVIDER_virtual-opencl-icd:imxviv ?= "libopencl-imx" | ||
| 581 | PREFERRED_RPROVIDER_virtual-opencl-icd:imxmali ?= "mali-imx-libopencl" | ||
| 582 | |||
| 576 | PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" | 583 | PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" |
| 577 | PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d" | 584 | PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d" |
| 578 | PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d" | 585 | PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d" |
| 586 | PREFERRED_PROVIDER_virtual/libg2d:mx943-nxp-bsp ?= "imx-pxp-g2d" | ||
| 579 | 587 | ||
| 580 | # Set preferred Vulkan ICD runtime | 588 | # Set preferred Vulkan ICD runtime |
| 581 | PREFERRED_RPROVIDER_virtual-vulkan-icd ?= "mesa" | 589 | PREFERRED_RPROVIDER_virtual-vulkan-icd ?= "mesa-vulkan-drivers" |
| 582 | PREFERRED_RPROVIDER_virtual-vulkan-icd:imxviv ?= "libvulkan-imx" | 590 | PREFERRED_RPROVIDER_virtual-vulkan-icd:imxviv ?= "libvulkan-imx" |
| 583 | PREFERRED_RPROVIDER_virtual-vulkan-icd:imxmali ?= "mali-imx-libvulkan" | 591 | PREFERRED_RPROVIDER_virtual-vulkan-icd:imxmali ?= "mali-imx-libvulkan" |
| 584 | 592 | ||
| @@ -588,8 +596,6 @@ PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx" | |||
| 588 | PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" | 596 | PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" |
| 589 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" | 597 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" |
| 590 | 598 | ||
| 591 | PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "24.1.6.imx" | ||
| 592 | |||
| 593 | # Use i.MX libdrm Version | 599 | # Use i.MX libdrm Version |
| 594 | PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.123.imx" | 600 | PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.123.imx" |
| 595 | 601 | ||
| @@ -603,10 +609,10 @@ PREFERRED_VERSION_vulkan-utility-libraries:imxvulkan ??= "1.3.275.0.imx" | |||
| 603 | PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx" | 609 | PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx" |
| 604 | 610 | ||
| 605 | # Use i.MX optee Version | 611 | # Use i.MX optee Version |
| 606 | PREFERRED_VERSION_optee-os:imx-nxp-bsp ??= "4.6.0.imx" | 612 | PREFERRED_VERSION_optee-os:imx-nxp-bsp ??= "4.8.0.imx" |
| 607 | PREFERRED_VERSION_optee-client:imx-nxp-bsp ??= "4.6.0.imx" | 613 | PREFERRED_VERSION_optee-client:imx-nxp-bsp ??= "4.8.0.imx" |
| 608 | PREFERRED_VERSION_optee-test:imx-nxp-bsp ??= "4.6.0.imx" | 614 | PREFERRED_VERSION_optee-test:imx-nxp-bsp ??= "4.8.0.imx" |
| 609 | PREFERRED_VERSION_optee-os-tadevkit:imx-nxp-bsp ??= "4.6.0.imx" | 615 | PREFERRED_VERSION_optee-os-tadevkit:imx-nxp-bsp ??= "4.8.0.imx" |
| 610 | 616 | ||
| 611 | # Use i.MX opencv Version | 617 | # Use i.MX opencv Version |
| 612 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" | 618 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" |
| @@ -688,5 +694,7 @@ HOSTTOOLS_NONFATAL:append:mx8-nxp-bsp = " sha384sum" | |||
| 688 | # Add task to generate the mfgtool bundle for the image. | 694 | # Add task to generate the mfgtool bundle for the image. |
| 689 | IMAGE_CLASSES:append:imx-generic-bsp = " image_populate_mfgtool" | 695 | IMAGE_CLASSES:append:imx-generic-bsp = " image_populate_mfgtool" |
| 690 | 696 | ||
| 697 | SECO_FIRMWARE_NAME:mx943-generic-bsp ?= "mx943${IMX_SOC_REV_LOWER}-ahab-container.img" | ||
| 698 | |||
| 691 | # Allow meta-imx to add NIP devices information until upstreamed. | 699 | # Allow meta-imx to add NIP devices information until upstreamed. |
| 692 | include conf/machine/include/imx-base-extend.inc | 700 | include conf/machine/include/imx-base-extend.inc |
