From: Tom Hochstein <tom.hochst...@nxp.com>
- weston uses the imxfbdev override for backend configuration
- imx-gpu-viv uses the imxdrm override for dependency configuration
Signed-off-by: Tom Hochstein <tom.hochst...@nxp.com>
Signed-off-by: Otavio Salvador <ota...@ossystems.com.br>
---
Changes in v3: None
Changes in v2: None
conf/machine/include/imx-base.inc | 22 +++++++++----------
.../imx-gpu-viv/imx-gpu-viv-6.inc | 2 +-
recipes-graphics/wayland/weston_4.0.0.imx.bb | 9 ++------
3 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/conf/machine/include/imx-base.inc
b/conf/machine/include/imx-base.inc
index 617ab943..b47dc3a2 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -59,17 +59,17 @@ DEFAULTTUNE_vf ?= "cortexa5thf-neon"
INHERIT += "machine-overrides-extender"
MACHINEOVERRIDES_EXTENDER_mx25 = "use-mainline-bsp"
-MACHINEOVERRIDES_EXTENDER_mx6q =
"imxipu:imxvpu:imxgpu:imxgpu2d:imxdpublit:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6dl =
"imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6sx = "imxpxp:imxgpu:imxgpu2d:imxdpublit:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6sl = "imxpxp:imxgpu:imxgpu2d:imxdpublit:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6sll = "imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6ul = "imxpxp"
-MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx7d = "imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu:imxgpu2d:imxdpublit:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8mq = "imxvpu:imxgpu:imxdpu:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8mm = "imxvpu:imxgpu:imxgpu2d:imxdpu:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6q =
"imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxdpublit:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6dl =
"imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6sx =
"imxfbdev:imxpxp:imxgpu:imxgpu2d:imxdpublit:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6sl =
"imxfbdev:imxpxp:imxgpu:imxgpu2d:imxdpublit:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6sll = "imxfbdev:imxpxp:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6ul = "imxfbdev:imxpxp"
+MACHINEOVERRIDES_EXTENDER_mx6ull = "imxfbdev:imxpxp:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx7d = "imxfbdev:imxpxp:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx7ulp =
"imxfbdev:imxpxp:imxgpu:imxgpu2d:imxdpublit:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx8mq = "imxdrm:imxvpu:imxgpu:imxdpu:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx8mm =
"imxdrm:imxvpu:imxgpu:imxgpu2d:imxdpu:imxgpu3d"
MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
mx6 \
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index da5bae46..f23763d3 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -16,7 +16,7 @@ DEPENDS += " \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcb libxshmfence
libxxf86vm', \
'', d)} \
"
-DEPENDS_append_mx8 = " libdrm wayland"
+DEPENDS_append_imxdrm = " libdrm wayland"
# imx-gpu-viv does not provide everything it needs to for virtual/libgl
# on x11 backend or on Wayland backend with XWayland support.
diff --git a/recipes-graphics/wayland/weston_4.0.0.imx.bb
b/recipes-graphics/wayland/weston_4.0.0.imx.bb
index d656aa25..85a73b3e 100644
--- a/recipes-graphics/wayland/weston_4.0.0.imx.bb
+++ b/recipes-graphics/wayland/weston_4.0.0.imx.bb
@@ -38,19 +38,14 @@ EXTRA_OECONF_append_qemux86 = "\
EXTRA_OECONF_append_qemux86-64 = "\
WESTON_NATIVE_BACKEND=fbdev-backend.so \
"
-EXTRA_OECONF_append_mx6 = "\
- WESTON_NATIVE_BACKEND=fbdev-backend.so \
- "
-EXTRA_OECONF_append_mx7 = "\
+EXTRA_OECONF_append_imxfbdev = "\
WESTON_NATIVE_BACKEND=fbdev-backend.so \
"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms
fbdev wayland egl', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland',
'xwayland', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'opengl pam systemd
x11', d)} \
clients launch"
-# drm is not supported on mx6/mx7
-PACKAGECONFIG_remove_mx6 = "kms"
-PACKAGECONFIG_remove_mx7 = "kms"
+PACKAGECONFIG_remove_imxfbdev = "kms"
PACKAGECONFIG_append_imxgpu2d = " imxg2d"
PACKAGECONFIG_append_imxgpu3d = " cairo-glesv2"
#
--
2.18.0
--
_______________________________________________
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale
