Merge pull request #1317 from Freescale/backport-1316-to-kirkstone

[Backport kirkstone] Fix MACHINE_SOCARCH_FILTER for OpenCL

1 files changed, 5 insertions, 11 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 1a3a83d4..e3b6dc76 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -313,11 +313,15 @@ MACHINE_SOCARCH_FILTER:append:imxvulkan = " \
 "
 MACHINE_SOCARCH_FILTER:append:imxgpu = " \
     virtual/egl \
-    virtual/mesa \
     virtual/libopenvg \
+    virtual/mesa \
+    virtual/opencl-icd \
     libdrm \
     cairo \
     libgal-imx \
+    opencl-icd-loader \
+    opencl-clhpp \
+    opencl-headers \
     opencv \
     pango \
 "
@@ -341,16 +345,6 @@ MACHINE_SOCARCH_FILTER:append:imx-mainline-bsp = " \
     pango \
     qtbase \
 "
-MACHINE_SOCARCH_FILTER:append:mx6q-nxp-bsp = " \
-    opencl-icd-loader \
-    opencl-clhpp \
-    opencl-headers \
-"
-MACHINE_SOCARCH_FILTER:append:mx8-nxp-bsp = " \
-    opencl-icd-loader \
-    opencl-clhpp \
-    opencl-headers \
-"
 MACHINE_SOCARCH_FILTER:append:mx8qm-nxp-bsp = " \
     virtual/libopenvx \
 "