summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/imx-base.inc1
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc33
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.0-aarch64.bb6
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch32.bb (renamed from recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.0-aarch32.bb)4
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb6
5 files changed, 28 insertions, 22 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index cc55d327..8d6dac9d 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -463,6 +463,7 @@ PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "imx-gpu-viv"
463PREFERRED_PROVIDER_virtual/libgl:imxgpu3d ?= "imx-gpu-viv" 463PREFERRED_PROVIDER_virtual/libgl:imxgpu3d ?= "imx-gpu-viv"
464PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "imx-gpu-viv" 464PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "imx-gpu-viv"
465PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv" 465PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv"
466PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "imx-gpu-viv"
466PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" 467PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d"
467PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d" 468PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d"
468PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv" 469PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv"
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 8d014259..4abab088 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -6,7 +6,7 @@
6DESCRIPTION = "GPU driver and apps for i.MX" 6DESCRIPTION = "GPU driver and apps for i.MX"
7SECTION = "libs" 7SECTION = "libs"
8LICENSE = "Proprietary" 8LICENSE = "Proprietary"
9LIC_FILES_CHKSUM = "file://COPYING;md5=be5ff43682ed6c57dfcbeb97651c2829" 9LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
10 10
11DEPENDS += " \ 11DEPENDS += " \
12 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ 12 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
@@ -25,18 +25,6 @@ DEPENDS:append:mx8-nxp-bsp = " patchelf-native"
25# We depend on mesa to fill in what is missing. 25# We depend on mesa to fill in what is missing.
26DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}" 26DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}"
27 27
28EXTRA_PROVIDES = ""
29EXTRA_PROVIDES:append:imxgpu3d = " \
30 virtual/libgl \
31 virtual/libgles1 \
32 virtual/libgles2 \
33"
34EXTRA_PROVIDES:append:mx8-nxp-bsp = " \
35 virtual/libgbm \
36"
37PROVIDES_OPENVX = ""
38PROVIDES_OPENVX:mx8-nxp-bsp = "virtual/libopenvx"
39PROVIDES_OPENVX:mx8mm-nxp-bsp = ""
40PROVIDES += " \ 28PROVIDES += " \
41 imx-gpu-viv \ 29 imx-gpu-viv \
42 libgal-imx \ 30 libgal-imx \
@@ -46,9 +34,26 @@ PROVIDES += " \
46 virtual/egl \ 34 virtual/egl \
47 virtual/libopenvg \ 35 virtual/libopenvg \
48 virtual/opencl-icd \ 36 virtual/opencl-icd \
49 ${PROVIDES_OPENVX} \
50 ${EXTRA_PROVIDES} \ 37 ${EXTRA_PROVIDES} \
51" 38"
39EXTRA_PROVIDES = " \
40 ${PROVIDES_OPENGLES3} \
41 ${PROVIDES_OPENVX} \
42"
43EXTRA_PROVIDES:append:imxgpu3d = " \
44 virtual/libgl \
45 virtual/libgles1 \
46 virtual/libgles2 \
47"
48EXTRA_PROVIDES:append:mx8-nxp-bsp = " \
49 virtual/libgbm \
50"
51PROVIDES_OPENGLES3 = ""
52PROVIDES_OPENGLES3:mx8-nxp-bsp = "virtual/libgles3"
53PROVIDES_OPENGLES3:mx8mm-nxp-bsp = ""
54PROVIDES_OPENVX = ""
55PROVIDES_OPENVX:mx8-nxp-bsp = "virtual/libopenvx"
56PROVIDES_OPENVX:mx8mm-nxp-bsp = ""
52 57
53RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv" 58RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv"
54 59
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.0-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.0-aarch64.bb
deleted file mode 100644
index 81ca2526..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.0-aarch64.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require imx-gpu-viv-6.inc
2
3SRC_URI[md5sum] = "20cecb3e5440f63bb6612c740ccfe43a"
4SRC_URI[sha256sum] = "283f2f51cadf5138bd47269a73425a51f69453556fb80f18521da04317e547a8"
5
6COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.0-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch32.bb
index d6cae8b6..bb07fb10 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.0-aarch32.bb
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch32.bb
@@ -4,7 +4,7 @@
4 4
5require imx-gpu-viv-6.inc 5require imx-gpu-viv-6.inc
6 6
7SRC_URI[md5sum] = "9abc4e59919b68f81094c194edb525a2" 7SRC_URI[md5sum] = "8e83cb642033ac3b85a5473b6d92687e"
8SRC_URI[sha256sum] = "5f56e4690287fd4e8480d2c43101ef30383c95d155a3f06beadecad309e684a3" 8SRC_URI[sha256sum] = "89197fdb13dfc21c49968297c2e8b5cb8dd5563502278151d36b2dce2a2092ed"
9 9
10COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)" 10COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb
new file mode 100644
index 00000000..de527cda
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb
@@ -0,0 +1,6 @@
1require imx-gpu-viv-6.inc
2
3SRC_URI[md5sum] = "22de8a5f59a56a7ef499f590d1659b6f"
4SRC_URI[sha256sum] = "52921c0b59529f1598084e991eda1863100754f28a7744ba958158dff8074b3b"
5
6COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"