summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc2
-rw-r--r--dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend2
-rw-r--r--dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc2
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend6
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend6
5 files changed, 9 insertions, 9 deletions
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
index c719c8ae..b77fbc83 100644
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
+++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
@@ -41,4 +41,4 @@ python add_chromium_imx_patches() {
41 d.appendVar('OZONE_WAYLAND_EXTRA_PATCHES', ' ' + d.getVar('CHROMIUM_IMX_WAYLAND_PATCHES', 1)) 41 d.appendVar('OZONE_WAYLAND_EXTRA_PATCHES', ' ' + d.getVar('CHROMIUM_IMX_WAYLAND_PATCHES', 1))
42} 42}
43 43
44COMPATIBLE_MACHINE = "(mx6)" 44COMPATIBLE_MACHINE = "(mx6-nxp-bsp)"
diff --git a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
index 998d11f7..4cfa51ea 100644
--- a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
+++ b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
@@ -1,4 +1,4 @@
1# Only _mx8 machine do provide virtual/libgbm required for any drm* flavour 1# Only _mx8 machine do provide virtual/libgbm required for any drm* flavour
2DRM-REMOVE:imxgpu = "drm-gl drm-gles2" 2DRM-REMOVE:imxgpu = "drm-gl drm-gles2"
3DRM-REMOVE:imxgpu:mx8 = "" 3DRM-REMOVE:imxgpu:mx8-nxp-bsp = ""
4PACKAGECONFIG:remove = "${DRM-REMOVE}" 4PACKAGECONFIG:remove = "${DRM-REMOVE}"
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
index 8950c151..03e09e57 100644
--- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
+++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
@@ -22,7 +22,7 @@ QT_CONFIG_FLAGS:append:imxgpu2d = " -I${STAGING_KERNEL_DIR}/include/uapi \
22 -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1" 22 -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1"
23 23
24# The QT_CONFIG_FLAGS can pollute *.la files with -Dxxx 24# The QT_CONFIG_FLAGS can pollute *.la files with -Dxxx
25do_compile:append:mx6 () { 25do_compile:append:mx6-nxp-bsp () {
26 find lib -name "*.la" | xargs -n1 sed -i 's/-D.*=1//g' 26 find lib -name "*.la" | xargs -n1 sed -i 's/-D.*=1//g'
27} 27}
28 28
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
13PACKAGECONFIG_GL_IMX_GPU = "" 13PACKAGECONFIG_GL_IMX_GPU = ""
14PACKAGECONFIG_GL_IMX_GPU:mx8 = "gbm kms" 14PACKAGECONFIG_GL_IMX_GPU:mx8-nxp-bsp = "gbm kms"
15 15
16PACKAGECONFIG_GL:imxpxp = "gles2" 16PACKAGECONFIG_GL:imxpxp = "gles2"
17PACKAGECONFIG_GL:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \ 17PACKAGECONFIG_GL:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \
@@ -30,8 +30,8 @@ PACKAGECONFIG_PLATFORM:use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES
30PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}" 30PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}"
31 31
32PACKAGECONFIG_VULKAN_IMX_GPU = "" 32PACKAGECONFIG_VULKAN_IMX_GPU = ""
33PACKAGECONFIG_VULKAN_IMX_GPU:mx8 = "vulkan" 33PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan"
34PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm = "" 34PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = ""
35PACKAGECONFIG_VULKAN = "" 35PACKAGECONFIG_VULKAN = ""
36PACKAGECONFIG_VULKAN:imxgpu = "${PACKAGECONFIG_VULKAN_IMX_GPU}" 36PACKAGECONFIG_VULKAN:imxgpu = "${PACKAGECONFIG_VULKAN_IMX_GPU}"
37PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}" 37PACKAGECONFIG += "${@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
2PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx" 2PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx"
3 3
4PACKAGECONFIG:remove:mx6 = "xcomposite-egl xcomposite-glx" 4PACKAGECONFIG:remove:mx6-nxp-bsp = "xcomposite-egl xcomposite-glx"
5PACKAGECONFIG:remove:mx7 = "xcomposite-egl xcomposite-glx" 5PACKAGECONFIG: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 = "xcomposite-egl xcomposite-glx" 8PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx"