summaryrefslogtreecommitdiffstats
path: root/dynamic-layers
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers')
-rw-r--r--dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb4
-rw-r--r--dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc44
-rw-r--r--dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb21
-rw-r--r--dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc44
-rw-r--r--dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch52
-rw-r--r--dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend9
-rw-r--r--dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend7
-rw-r--r--dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch56
-rw-r--r--dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb7
-rw-r--r--dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch30
-rw-r--r--dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend8
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend2
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend1
-rw-r--r--dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend3
-rw-r--r--dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend1
15 files changed, 86 insertions, 203 deletions
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
index b10bd869a..df704dc99 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
@@ -11,8 +11,6 @@ IMX_OEI_SRC ?= "git://github.com/nxp-imx/imx-oei.git;protocol=https"
11SRCBRANCH = "master" 11SRCBRANCH = "master"
12SRCREV = "1a572a640ef8d6883e8ca39744cd6d2d5dbed678" 12SRCREV = "1a572a640ef8d6883e8ca39744cd6d2d5dbed678"
13 13
14S = "${WORKDIR}/git"
15
16inherit deploy 14inherit deploy
17 15
18PACKAGE_ARCH = "${MACHINE_ARCH}" 16PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -56,4 +54,6 @@ do_deploy() {
56FILES:${PN} = "/firmware" 54FILES:${PN} = "/firmware"
57SYSROOT_DIRS += "/firmware" 55SYSROOT_DIRS += "/firmware"
58 56
57PROVIDES += "virtual/imx-oei"
58
59COMPATIBLE_MACHINE = "(mx95-generic-bsp)" 59COMPATIBLE_MACHINE = "(mx95-generic-bsp)"
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
new file mode 100644
index 000000000..d8033622c
--- /dev/null
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
@@ -0,0 +1,44 @@
1# Set generic compiler for system manager core
2INHIBIT_DEFAULT_DEPS = "1"
3DEPENDS = "${SM_COMPILER}"
4SM_COMPILER ?= "gcc-arm-none-eabi-native"
5PROVIDES += "virtual/imx-system-manager"
6
7inherit deploy
8
9PACKAGE_ARCH = "${MACHINE_ARCH}"
10
11# Set monitor mode for none, one, or two
12PACKAGECONFIG[m0] = "M=0,,,,,m1 m2"
13PACKAGECONFIG[m1] = ",,,,,m0 m2"
14PACKAGECONFIG[m2] = "M=2,,,,,m0 m1"
15
16SYSTEM_MANAGER_CONFIG ?= "INVALID"
17
18LDFLAGS[unexport] = "1"
19
20EXTRA_OEMAKE = " \
21 V=y \
22 SM_CROSS_COMPILE=arm-none-eabi- \
23 ${PACKAGECONFIG_CONFARGS} \
24"
25
26do_configure() {
27 oe_runmake config=${SYSTEM_MANAGER_CONFIG} clean
28 oe_runmake config=${SYSTEM_MANAGER_CONFIG} cfg
29}
30
31do_compile() {
32 oe_runmake config=${SYSTEM_MANAGER_CONFIG}
33}
34
35do_install[noexec] = "1"
36
37addtask deploy after do_compile
38do_deploy() {
39 install -D -p -m 0644 \
40 ${B}/build/${SYSTEM_MANAGER_CONFIG}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
41 ${DEPLOYDIR}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}-${SYSTEM_MANAGER_CONFIG}.bin
42}
43
44COMPATIBLE_MACHINE = "(mx95-generic-bsp)"
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb
new file mode 100644
index 000000000..55826b016
--- /dev/null
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb
@@ -0,0 +1,21 @@
1SUMMARY = "i.MX System Manager Firmware"
2DESCRIPTION = "\
3The System Manager (SM) is a firmware that runs on a Cortex-M processor on \
4many NXP i.MX processors. The Cortex-M is the boot core, runs the boot ROM \
5which loads the SM (and other boot code), and then branches to the SM. The \
6SM then configures some aspects of the hardware such as isolation mechanisms \
7and then starts other cores in the system. After starting these cores, it \
8enters a service mode where it provides access to clocking, power, sensor, \
9and pin control via a client RPC API based on ARM's System Control and \
10Management Interface (SCMI)."
11LICENSE = "BSD-3-Clause"
12LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b66f32a90f9577a5a3255c21d79bc619"
13
14SRC_URI = "${IMX_SYSTEM_MANAGER_SRC};branch=${SRCBRANCH}"
15IMX_SYSTEM_MANAGER_SRC ?= "git://github.com/nxp-imx/imx-sm.git;protocol=https"
16SRCBRANCH = "master"
17SRCREV = "709deccd9338399eb39b5cf99a60eab4fa60d539"
18
19require imx-system-manager.inc
20
21PACKAGECONFIG ??= "m2"
diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
deleted file mode 100644
index b77fbc838..000000000
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
+++ /dev/null
@@ -1,44 +0,0 @@
1DEPENDS:append:imxvpu = " imx-vpuwrap"
2
3# Additional imx code and patches are included in the chromium-imx git repository.
4# The code below fetches this repository, copies the extra source over to the main
5# chromium source directory, and applies the patches.
6
7CHROMIUM_IMX_BRANCH ?= "master"
8CHROMIUM_IMX_SRCREV ?= "HEAD"
9CHROMIUM_IMX_DESTSUFFIX ?= "chromium-imx-git"
10
11PATCH_BASE_DIR = "${WORKDIR}/${CHROMIUM_IMX_DESTSUFFIX}/patches"
12
13CHROMIUM_IMX_COMMON_PATCHES ?= " "
14CHROMIUM_IMX_VPU_PATCHES ?= " "
15CHROMIUM_IMX_WAYLAND_PATCHES ?= " "
16
17SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV};protocol=https"
18
19do_unpack[postfuncs] += "copy_chromium_imx_files"
20# using =+ instead of += to make sure add_chromium_imx_patches is
21# executed before add_ozone_wayland_patches in the main recipe;
22# this is necessary because add_chromium_imx_patches appends
23# patches to the OZONE_WAYLAND_EXTRA_PATCHES variable
24do_patch[prefuncs] =+ "add_chromium_imx_patches"
25
26# * Lost context problems are not known to happen with Vivante GPUs,
27# so it is safe to use ignore-lost-context
28# * Proprietary codecs need to be enabled for h.264 and MP4 support
29PACKAGECONFIG:append = " ignore-lost-context proprietary-codecs"
30
31copy_chromium_imx_files() {
32 # sources in src/ are already organized in a manner
33 # that matches the subdirectories in the chromium
34 # source directory; just copy over the files in src/
35 cp -r ${WORKDIR}/chromium-imx-git/src/* ${S}/
36}
37
38python add_chromium_imx_patches() {
39 d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_COMMON_PATCHES', 1))
40 d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_VPU_PATCHES', 1))
41 d.appendVar('OZONE_WAYLAND_EXTRA_PATCHES', ' ' + d.getVar('CHROMIUM_IMX_WAYLAND_PATCHES', 1))
42}
43
44COMPATIBLE_MACHINE = "(mx6-nxp-bsp)"
diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch
deleted file mode 100644
index 23a8fff9c..000000000
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1Upstream-Status: Pending
2diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h
3--- chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h 2016-05-27 11:45:31.248306710 -0500
4+++ chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h 2016-05-27 11:49:53.000000000 -0500
5@@ -36,7 +36,7 @@
6 extern "C" {
7 #endif
8
9-#include <va/va.h>
10+#include <libva/va/va.h>
11
12 /**
13 * \defgroup api_dec_jpeg JPEG decoding API
14diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va.h chromium-48.0.2548.0/third_party/libva/va/va.h
15--- chromium-48.0.2548.0_org/third_party/libva/va/va.h 2016-05-27 11:45:31.248306710 -0500
16+++ chromium-48.0.2548.0/third_party/libva/va/va.h 2016-05-27 11:49:16.000000000 -0500
17@@ -80,7 +80,7 @@
18
19 #include <stddef.h>
20 #include <stdint.h>
21-#include <va/va_version.h>
22+#include <libva/va/va_version.h>
23
24 #ifdef __cplusplus
25 extern "C" {
26@@ -2836,16 +2836,16 @@
27 */
28 #define VA_PICTURE_HEVC_RPS_LT_CURR 0x00000040
29
30-#include <va/va_dec_hevc.h>
31-#include <va/va_dec_jpeg.h>
32-#include <va/va_dec_vp8.h>
33-#include <va/va_dec_vp9.h>
34-#include <va/va_enc_hevc.h>
35-#include <va/va_enc_h264.h>
36-#include <va/va_enc_jpeg.h>
37-#include <va/va_enc_mpeg2.h>
38-#include <va/va_enc_vp8.h>
39-#include <va/va_vpp.h>
40+#include <libva/va/va_dec_hevc.h>
41+#include <libva/va/va_dec_jpeg.h>
42+#include <libva/va/va_dec_vp8.h>
43+#include <libva/va/va_dec_vp9.h>
44+#include <libva/va/va_enc_hevc.h>
45+#include <libva/va/va_enc_h264.h>
46+#include <libva/va/va_enc_jpeg.h>
47+#include <libva/va/va_enc_mpeg2.h>
48+#include <libva/va/va_enc_vp8.h>
49+#include <libva/va/va_vpp.h>
50
51 /**@}*/
52
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
index 7d84ee93a..865b29349 100644
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
@@ -6,8 +6,13 @@ SYSTEMD_AUTO_ENABLE:imx-nxp-bsp = "disable"
6 6
7DEPENDS:append:mx95-nxp-bsp = " libdrm" 7DEPENDS:append:mx95-nxp-bsp = " libdrm"
8 8
9PACKAGECONFIG:remove:mx95-nxp-bsp = "libcamera" 9PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}"
10PACKAGECONFIG:remove:imx-nxp-bsp = "gstreamer" 10PACKAGECONFIG_REMOVE ?= ""
11PACKAGECONFIG_REMOVE:mx6-nxp-bsp ?= "gstreamer"
12PACKAGECONFIG_REMOVE:mx7-nxp-bsp ?= "gstreamer"
13PACKAGECONFIG_REMOVE:mx8-nxp-bsp ?= "gstreamer"
14PACKAGECONFIG_REMOVE:mx93-nxp-bsp ?= "gstreamer"
15
11PACKAGECONFIG:class-target:append:imx-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez-lc3', '', d)}" 16PACKAGECONFIG:class-target:append:imx-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez-lc3', '', d)}"
12 17
13# FIXME: Needs to qualify on PACKAGECONFIG 18# FIXME: Needs to qualify on PACKAGECONFIG
diff --git a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
index 4cfa51ea9..dfedc062e 100644
--- a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
+++ b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
@@ -1,4 +1,5 @@
1# Only _mx8 machine do provide virtual/libgbm required for any drm* flavour 1# 6 and 7 Vivante do not provide virtual/libgbm required for any drm* flavour
2DRM-REMOVE:imxgpu = "drm-gl drm-gles2" 2DRM-REMOVE = ""
3DRM-REMOVE:imxgpu:mx8-nxp-bsp = "" 3DRM-REMOVE:imxgpu:mx6-nxp-bsp = "drm-gl drm-gles2"
4DRM-REMOVE:imxgpu:mx7-nxp-bsp = "drm-gl drm-gles2"
4PACKAGECONFIG:remove = "${DRM-REMOVE}" 5PACKAGECONFIG:remove = "${DRM-REMOVE}"
diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch
deleted file mode 100644
index 5769d5552..000000000
--- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 018249d180705657efbecdce3736c9a415412762 Mon Sep 17 00:00:00 2001
2From: Meng Li <Meng.Li@windriver.com>
3Date: Tue, 9 Jul 2024 14:35:06 +0800
4Subject: [PATCH] FMCCFGReader: improve parameter definition of function
5 errorFuncHandler
6
7When building fmc package, there is below error:
8FMCCFGReader.cpp: In member function 'void CCFGReader::parseCfgData(std::string)':
9FMCCFGReader.cpp:98:40: error: invalid conversion from
10'void (*)(void*, xmlErrorPtr)' {aka 'void (*)(void*, _xmlError*)'} to
11'xmlStructuredErrorFunc' {aka 'void (*)(void*, const _xmlError*)'} [-fpermissive]
12 98 | xmlSetStructuredErrorFunc( &error, errorFuncHandler );
13 | ^~~~~~~~~~~~~~~~
14 | |
15 | void (*)(void*, xmlErrorPtr) {aka void (*)(void*, _xmlError*)}
16Because in libxml2 package, the parameter definition of function
17pointer xmlStructuredErrorFunc has changed, adjust the parameter
18of errorFuncHandler to align with upstream.
19
20Upstream-Status: Pending
21
22Signed-off-by: Meng Li <Meng.Li@windriver.com>
23---
24 source/FMCGenericError.cpp | 2 +-
25 source/FMCGenericError.h | 2 +-
26 2 files changed, 2 insertions(+), 2 deletions(-)
27
28diff --git a/source/FMCGenericError.cpp b/source/FMCGenericError.cpp
29index a1a87a4..c11742c 100644
30--- a/source/FMCGenericError.cpp
31+++ b/source/FMCGenericError.cpp
32@@ -33,7 +33,7 @@
33 #include "FMCUtils.h"
34 #include "logger.hpp"
35
36-void errorFuncHandler( void * ctx, xmlErrorPtr error )
37+void errorFuncHandler( void * ctx, const xmlError *error )
38 {
39 char *filestr = (char*)"";
40 char *msgstr = (char*)"";
41diff --git a/source/FMCGenericError.h b/source/FMCGenericError.h
42index 504a81b..61ab6c1 100644
43--- a/source/FMCGenericError.h
44+++ b/source/FMCGenericError.h
45@@ -35,7 +35,7 @@
46
47 const int NO_LINE = -1;
48
49-void errorFuncHandler( void * ctx, xmlErrorPtr error );
50+void errorFuncHandler( void * ctx, const xmlError *error );
51
52
53 class CGenericError {
54--
552.34.1
56
diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
index 457a202c9..227b6291b 100644
--- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
+++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
@@ -7,12 +7,7 @@ PR = "r2"
7DEPENDS = "libxml2 fmlib tclap" 7DEPENDS = "libxml2 fmlib tclap"
8 8
9SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1" 9SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1"
10SRC_URI:append = " \ 10SRCREV = "5b9f4b16a864e9dfa58cdcc860be278a7f66ac18"
11 file://0001-FMCCFGReader-improve-parameter-definition-of-functio.patch \
12"
13SRCREV = "63c8ac99899a9bcd723801579b4d786594670455"
14
15S = "${WORKDIR}/git"
16 11
17EXTRA_OEMAKE = 'FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \ 12EXTRA_OEMAKE = 'FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \
18 FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \ 13 FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \
diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch
deleted file mode 100644
index 283a081ba..000000000
--- a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 8ad045e5e664fe2d1bd9f88616d5bf83437aab4e Mon Sep 17 00:00:00 2001
2From: Yang Dong <b56112@freescale.com>
3Date: Wed, 9 Sep 2015 13:08:57 +0800
4Subject: [PATCH] xserver-common: enable iglx module
5
6Enable iglx module to pass indirect glx rendering test case.
7
8Upstream-Status: Inappropriate [imx specific]
9
10Date: Sep 9, 2015
11Signed-off-by Yang Dong <b56112@freescale.com>
12---
13 X11/xserver-common | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/X11/xserver-common b/X11/xserver-common
17index 4dc48c4..d19b858 100644
18--- a/X11/xserver-common
19+++ b/X11/xserver-common
20@@ -44,6 +44,7 @@ SCREEN_SIZE=`fallback_screen_arg`
21 export USER=root
22 export XSERVER_DEFAULT_ORIENTATION=normal
23
24+INPUT_EXTRA_ARGS="+iglx"
25 ARGS="-br -pn -nolisten tcp $INPUT_EXTRA_ARGS"
26 DPI="100"
27 MOUSE=""
28--
291.9.1
30
diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend
deleted file mode 100644
index be6945744..000000000
--- a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
1# i.MX extra configuration
2FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
3
4SRC_URI:append:imxgpu3d = " \
5 file://0016-xserver-common-enable-iglx-module.patch \
6"
7
8PACKAGE_ARCH:imxgpu3d = "${MACHINE_SOCARCH}"
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 7401a5669..e450e568e 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -12,6 +12,7 @@ SRC_URI:append:imxgpu = " \
12 12
13PACKAGECONFIG_GL_IMX_GPU = "" 13PACKAGECONFIG_GL_IMX_GPU = ""
14PACKAGECONFIG_GL_IMX_GPU:mx8-nxp-bsp = "gbm kms" 14PACKAGECONFIG_GL_IMX_GPU:mx8-nxp-bsp = "gbm kms"
15PACKAGECONFIG_GL_IMX_GPU:mx95-nxp-bsp = "gbm kms"
15 16
16PACKAGECONFIG_GL:imxpxp = "gles2" 17PACKAGECONFIG_GL:imxpxp = "gles2"
17PACKAGECONFIG_GL:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \ 18PACKAGECONFIG_GL:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \
@@ -31,6 +32,7 @@ PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}"
31 32
32PACKAGECONFIG_VULKAN_IMX_GPU = "" 33PACKAGECONFIG_VULKAN_IMX_GPU = ""
33PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan" 34PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan"
35PACKAGECONFIG_VULKAN_IMX_GPU:mx9-nxp-bsp = "vulkan"
34PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = "" 36PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = ""
35PACKAGECONFIG_VULKAN = "" 37PACKAGECONFIG_VULKAN = ""
36PACKAGECONFIG_VULKAN:imxgpu = "${PACKAGECONFIG_VULKAN_IMX_GPU}" 38PACKAGECONFIG_VULKAN:imxgpu = "${PACKAGECONFIG_VULKAN_IMX_GPU}"
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
index a97b765f1..659a7cc0a 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
@@ -6,3 +6,4 @@ PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx"
6 6
7# i.MX8 does never provide native x11, so required dependencies are not met 7# i.MX8 does never provide native x11, so required dependencies are not met
8PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx" 8PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx"
9PACKAGECONFIG:remove:mx95-nxp-bsp = "xcomposite-egl xcomposite-glx"
diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
index 1c51fc09d..b12499666 100644
--- a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
+++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
@@ -14,6 +14,8 @@ PACKAGECONFIG_GRAPHICS:imxgpu3d = " \
14PACKAGECONFIG_GRAPHICS_IMX_GPU = "" 14PACKAGECONFIG_GRAPHICS_IMX_GPU = ""
15PACKAGECONFIG_GRAPHICS_IMX_GPU:mx8-nxp-bsp = " \ 15PACKAGECONFIG_GRAPHICS_IMX_GPU:mx8-nxp-bsp = " \
16 gbm kms" 16 gbm kms"
17PACKAGECONFIG_GRAPHICS_IMX_GPU:mx95-nxp-bsp = " \
18 gbm kms"
17 19
18PACKAGECONFIG_GRAPHICS:use-mainline-bsp ?= " \ 20PACKAGECONFIG_GRAPHICS:use-mainline-bsp ?= " \
19 gles2 gbm kms" 21 gles2 gbm kms"
@@ -51,4 +53,5 @@ PACKAGECONFIG_VULKAN:imxgpu = " \
51 ${PACKAGECONFIG_VULKAN_IMX_GPU}" 53 ${PACKAGECONFIG_VULKAN_IMX_GPU}"
52PACKAGECONFIG_VULKAN_IMX_GPU = "" 54PACKAGECONFIG_VULKAN_IMX_GPU = ""
53PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan" 55PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan"
56PACKAGECONFIG_VULKAN_IMX_GPU:mx95-nxp-bsp = "vulkan"
54PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = "" 57PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = ""
diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend
index ca011758b..f2b0b8025 100644
--- a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend
+++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend
@@ -4,3 +4,4 @@ PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx"
4PACKAGECONFIG:remove:mx6-nxp-bsp = "xcomposite-egl xcomposite-glx" 4PACKAGECONFIG:remove:mx6-nxp-bsp = "xcomposite-egl xcomposite-glx"
5PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx" 5PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx"
6PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx" 6PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx"
7PACKAGECONFIG:remove:mx95-nxp-bsp = "xcomposite-egl xcomposite-glx"