summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/imx-base.inc20
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc2
-rw-r--r--recipes-graphics/wayland/weston_4.0.0.imx.bb9
3 files changed, 13 insertions, 18 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 90dfe8c6..89df1dec 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -62,16 +62,16 @@ DEFAULTTUNE_vf ?= "cortexa5thf-neon"
62INHERIT += "machine-overrides-extender" 62INHERIT += "machine-overrides-extender"
63 63
64MACHINEOVERRIDES_EXTENDER_mx25 = "use-mainline-bsp" 64MACHINEOVERRIDES_EXTENDER_mx25 = "use-mainline-bsp"
65MACHINEOVERRIDES_EXTENDER_mx6q = "imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d" 65MACHINEOVERRIDES_EXTENDER_mx6q = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
66MACHINEOVERRIDES_EXTENDER_mx6dl = "imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc" 66MACHINEOVERRIDES_EXTENDER_mx6dl = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc"
67MACHINEOVERRIDES_EXTENDER_mx6sx = "imxpxp:imxgpu:imxgpu2d:imxgpu3d" 67MACHINEOVERRIDES_EXTENDER_mx6sx = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
68MACHINEOVERRIDES_EXTENDER_mx6sl = "imxpxp:imxgpu:imxgpu2d:imxepdc" 68MACHINEOVERRIDES_EXTENDER_mx6sl = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc"
69MACHINEOVERRIDES_EXTENDER_mx6sll = "imxpxp:imxepdc" 69MACHINEOVERRIDES_EXTENDER_mx6sll = "imxfbdev:imxpxp:imxepdc"
70MACHINEOVERRIDES_EXTENDER_mx6ul = "imxpxp" 70MACHINEOVERRIDES_EXTENDER_mx6ul = "imxfbdev:imxpxp"
71MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc" 71MACHINEOVERRIDES_EXTENDER_mx6ull = "imxfbdev:imxpxp:imxepdc"
72MACHINEOVERRIDES_EXTENDER_mx7d = "imxpxp:imxepdc" 72MACHINEOVERRIDES_EXTENDER_mx7d = "imxfbdev:imxpxp:imxepdc"
73MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu:imxgpu2d:imxgpu3d" 73MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
74MACHINEOVERRIDES_EXTENDER_mx8mq = "imxvpu:imxgpu:imxgpu3d" 74MACHINEOVERRIDES_EXTENDER_mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d"
75 75
76MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ 76MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
77 mx6 \ 77 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 75158444..f0e549f1 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -12,11 +12,11 @@ DEPENDS += " \
12 bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes', \ 12 bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
13 '', d), d)} \ 13 '', d), d)} \
14" 14"
15DEPENDS += "libdrm"
16DEPENDS += " \ 15DEPENDS += " \
17 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcb libxshmfence libxxf86vm', \ 16 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcb libxshmfence libxxf86vm', \
18 '', d)} \ 17 '', d)} \
19" 18"
19DEPENDS_append_imxdrm = " libdrm wayland"
20 20
21# imx-gpu-viv does not provide everything it needs to for virtual/libgl 21# imx-gpu-viv does not provide everything it needs to for virtual/libgl
22# on x11 backend or on Wayland backend with XWayland support. 22# 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 b8464719..fc6a65f7 100644
--- a/recipes-graphics/wayland/weston_4.0.0.imx.bb
+++ b/recipes-graphics/wayland/weston_4.0.0.imx.bb
@@ -40,19 +40,14 @@ EXTRA_OECONF_append_qemux86 = "\
40EXTRA_OECONF_append_qemux86-64 = "\ 40EXTRA_OECONF_append_qemux86-64 = "\
41 WESTON_NATIVE_BACKEND=fbdev-backend.so \ 41 WESTON_NATIVE_BACKEND=fbdev-backend.so \
42 " 42 "
43EXTRA_OECONF_append_mx6 = "\ 43EXTRA_OECONF_append_imxfbdev = "\
44 WESTON_NATIVE_BACKEND=fbdev-backend.so \
45 "
46EXTRA_OECONF_append_mx7 = "\
47 WESTON_NATIVE_BACKEND=fbdev-backend.so \ 44 WESTON_NATIVE_BACKEND=fbdev-backend.so \
48 " 45 "
49PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ 46PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
50 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ 47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
51 ${@bb.utils.filter('DISTRO_FEATURES', 'opengl pam systemd x11', d)} \ 48 ${@bb.utils.filter('DISTRO_FEATURES', 'opengl pam systemd x11', d)} \
52 clients launch" 49 clients launch"
53# drm is not supported on mx6/mx7 50PACKAGECONFIG_remove_imxfbdev = "kms"
54PACKAGECONFIG_remove_mx6 = "kms"
55PACKAGECONFIG_remove_mx7 = "kms"
56PACKAGECONFIG_append_imxgpu2d = " imxg2d" 51PACKAGECONFIG_append_imxgpu2d = " imxg2d"
57PACKAGECONFIG_append_imxgpu3d = " cairo-glesv2" 52PACKAGECONFIG_append_imxgpu3d = " cairo-glesv2"
58# 53#