diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2018-06-29 13:56:17 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2018-06-29 14:19:23 -0300 |
commit | 7f993294c7eef1dd7a34097758d3e904940e51e2 (patch) | |
tree | 9120a60140496c02db3cc224c2115eaf83d351f6 | |
parent | dca6c66e5710938a3ea035b09b86ca3d1a6915c6 (diff) | |
download | meta-freescale-7f993294c7eef1dd7a34097758d3e904940e51e2.tar.gz |
imx-base: Use i.MX's fork of libdrm for i.MX6 and i.MX7
There few components which require the new libdrm fork, so we must use
it when using NXP's BSP components. Besides adding the preferred
version we need also to add it to the SoC architecture filter.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit 75a3fdf4cb0e3a8bb8a08da0a9a486f541f23124)
-rw-r--r-- | conf/machine/include/imx-base.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 419ab1bc8..2a2ead218 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -118,6 +118,7 @@ MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \ | |||
118 | virtual/libgles1 \ | 118 | virtual/libgles1 \ |
119 | virtual/libgles2 \ | 119 | virtual/libgles2 \ |
120 | virtual/libopenvg \ | 120 | virtual/libopenvg \ |
121 | libdrm \ | ||
121 | cairo \ | 122 | cairo \ |
122 | gstreamer1.0-plugins-bad \ | 123 | gstreamer1.0-plugins-bad \ |
123 | libgal-imx \ | 124 | libgal-imx \ |
@@ -203,7 +204,7 @@ SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx7ulp = "1" | |||
203 | # 1 - machine has Vivante GPU driver support | 204 | # 1 - machine has Vivante GPU driver support |
204 | MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ?= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" | 205 | MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ?= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" |
205 | 206 | ||
206 | # mx6 GPU libraries | 207 | # GPU libraries |
207 | PREFERRED_PROVIDER_virtual/egl_mx6q ?= "imx-gpu-viv" | 208 | PREFERRED_PROVIDER_virtual/egl_mx6q ?= "imx-gpu-viv" |
208 | PREFERRED_PROVIDER_virtual/egl_mx6dl ?= "imx-gpu-viv" | 209 | PREFERRED_PROVIDER_virtual/egl_mx6dl ?= "imx-gpu-viv" |
209 | PREFERRED_PROVIDER_virtual/egl_mx6sx ?= "imx-gpu-viv" | 210 | PREFERRED_PROVIDER_virtual/egl_mx6sx ?= "imx-gpu-viv" |
@@ -249,6 +250,10 @@ PREFERRED_PROVIDER_virtual/libg2d_mx7ulp ?= "imx-gpu-viv" | |||
249 | PREFERRED_VERSION_weston_mx6 ?= "2.0.0" | 250 | PREFERRED_VERSION_weston_mx6 ?= "2.0.0" |
250 | PREFERRED_VERSION_weston_mx7 ?= "2.0.0" | 251 | PREFERRED_VERSION_weston_mx7 ?= "2.0.0" |
251 | 252 | ||
253 | # Use i.MX libdrm Version | ||
254 | PREFERRED_VERSION_libdrm_mx6 ?= "2.4.84.imx" | ||
255 | PREFERRED_VERSION_libdrm_mx7 ?= "2.4.84.imx" | ||
256 | |||
252 | # Handle default kernel | 257 | # Handle default kernel |
253 | IMX_DEFAULT_KERNEL = "linux-imx" | 258 | IMX_DEFAULT_KERNEL = "linux-imx" |
254 | IMX_DEFAULT_KERNEL_mxs = "linux-fslc" | 259 | IMX_DEFAULT_KERNEL_mxs = "linux-fslc" |