From 286385e3b2b6d6b4c60faf14fd3170ec2279139e Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 2 Mar 2022 09:52:09 -0600 Subject: dynamic-layers: Update SOC overrides Fix dynamic layer overrides missed by the script. Signed-off-by: Tom Hochstein --- dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 6 +++--- dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'dynamic-layers/qt5-layer') diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 0d5897ad..7401a566 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -11,7 +11,7 @@ SRC_URI:append:imxgpu = " \ " PACKAGECONFIG_GL_IMX_GPU = "" -PACKAGECONFIG_GL_IMX_GPU:mx8 = "gbm kms" +PACKAGECONFIG_GL_IMX_GPU:mx8-nxp-bsp = "gbm kms" PACKAGECONFIG_GL:imxpxp = "gles2" PACKAGECONFIG_GL:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \ @@ -30,8 +30,8 @@ PACKAGECONFIG_PLATFORM:use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}" PACKAGECONFIG_VULKAN_IMX_GPU = "" -PACKAGECONFIG_VULKAN_IMX_GPU:mx8 = "vulkan" -PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm = "" +PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan" +PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = "" PACKAGECONFIG_VULKAN = "" PACKAGECONFIG_VULKAN:imxgpu = "${PACKAGECONFIG_VULKAN_IMX_GPU}" PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend index c1594e05..a97b765f 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend @@ -1,8 +1,8 @@ # etnaviv mesa does not have glx PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx" -PACKAGECONFIG:remove:mx6 = "xcomposite-egl xcomposite-glx" -PACKAGECONFIG:remove:mx7 = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx6-nxp-bsp = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx" # i.MX8 does never provide native x11, so required dependencies are not met -PACKAGECONFIG:remove:mx8 = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx" -- cgit v1.2.3-54-g00ecf