diff options
| author | Tom Hochstein <tom.hochstein@nxp.com> | 2022-03-02 09:52:09 -0600 |
|---|---|---|
| committer | Tom Hochstein <tom.hochstein@nxp.com> | 2022-03-02 09:56:39 -0600 |
| commit | 286385e3b2b6d6b4c60faf14fd3170ec2279139e (patch) | |
| tree | 13f4426cefdf0ec30ab38b86490b30478178b1ca /dynamic-layers/qt5-layer | |
| parent | 04a7bbdddfe9cfd41e93f127fed41293cde79741 (diff) | |
| download | meta-freescale-286385e3b2b6d6b4c60faf14fd3170ec2279139e.tar.gz | |
dynamic-layers: Update SOC overrides
Fix dynamic layer overrides missed by the script.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Diffstat (limited to 'dynamic-layers/qt5-layer')
| -rw-r--r-- | dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 6 | ||||
| -rw-r--r-- | dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend | 6 |
2 files changed, 6 insertions, 6 deletions
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 = " \ | |||
| 11 | " | 11 | " |
| 12 | 12 | ||
| 13 | PACKAGECONFIG_GL_IMX_GPU = "" | 13 | PACKAGECONFIG_GL_IMX_GPU = "" |
| 14 | PACKAGECONFIG_GL_IMX_GPU:mx8 = "gbm kms" | 14 | PACKAGECONFIG_GL_IMX_GPU:mx8-nxp-bsp = "gbm kms" |
| 15 | 15 | ||
| 16 | PACKAGECONFIG_GL:imxpxp = "gles2" | 16 | PACKAGECONFIG_GL:imxpxp = "gles2" |
| 17 | PACKAGECONFIG_GL:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \ | 17 | 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 | |||
| 30 | PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}" | 30 | PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}" |
| 31 | 31 | ||
| 32 | PACKAGECONFIG_VULKAN_IMX_GPU = "" | 32 | PACKAGECONFIG_VULKAN_IMX_GPU = "" |
| 33 | PACKAGECONFIG_VULKAN_IMX_GPU:mx8 = "vulkan" | 33 | PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan" |
| 34 | PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm = "" | 34 | PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = "" |
| 35 | PACKAGECONFIG_VULKAN = "" | 35 | PACKAGECONFIG_VULKAN = "" |
| 36 | PACKAGECONFIG_VULKAN:imxgpu = "${PACKAGECONFIG_VULKAN_IMX_GPU}" | 36 | PACKAGECONFIG_VULKAN:imxgpu = "${PACKAGECONFIG_VULKAN_IMX_GPU}" |
| 37 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}" | 37 | 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 @@ | |||
| 1 | # etnaviv mesa does not have glx | 1 | # etnaviv mesa does not have glx |
| 2 | PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx" | 2 | PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx" |
| 3 | 3 | ||
| 4 | PACKAGECONFIG:remove:mx6 = "xcomposite-egl xcomposite-glx" | 4 | PACKAGECONFIG:remove:mx6-nxp-bsp = "xcomposite-egl xcomposite-glx" |
| 5 | PACKAGECONFIG:remove:mx7 = "xcomposite-egl xcomposite-glx" | 5 | 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 |
| 8 | PACKAGECONFIG:remove:mx8 = "xcomposite-egl xcomposite-glx" | 8 | PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx" |