From f718ae3fc01f77b6497280456529b58553c28d08 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 30 Jul 2018 14:41:47 -0500 Subject: [PATCH] imx-base.inc: Simplify preferred providers for graphics Replace SOC-specific overrides with feature overrides. Signed-off-by: Tom Hochstein Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 57 ++++++------------------------- 1 file changed, 11 insertions(+), 46 deletions(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index ef012820..84a6acef 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -210,52 +210,17 @@ SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_imxgpu = "1" # 1 - machine has Vivante GPU driver support MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ?= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" -# GPU libraries -PREFERRED_PROVIDER_virtual/egl_mx6q ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/egl_mx6dl ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/egl_mx6sx ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/egl_mx6sl ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/egl_mx6sll ?= "mesa" -PREFERRED_PROVIDER_virtual/egl_mx6ul ?= "mesa" -PREFERRED_PROVIDER_virtual/egl_mx6ull ?= "mesa" -PREFERRED_PROVIDER_virtual/egl_mx7ulp ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/egl_mx8mq ?= "imx-gpu-viv" - -PREFERRED_PROVIDER_virtual/libgles1_mx6q ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles1_mx6dl ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles1_mx6sx ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles1_mx6sl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles1_mx6sll ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles1_mx6ul ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles1_mx6ull ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles1_mx7ulp ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles1_mx8mq ?= "imx-gpu-viv" - -PREFERRED_PROVIDER_virtual/libgles2_mx6q ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles2_mx6dl ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles2_mx6sx ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles2_mx6sl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles2_mx6sll ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles2_mx6ul ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles2_mx6ull ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles2_mx7ulp ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles2_mx8mq ?= "imx-gpu-viv" - -PREFERRED_PROVIDER_virtual/libgl_mx6q ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgl_mx6dl ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgl_mx6sx ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgl_mx6sl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgl_mx6sll ?= "mesa" -PREFERRED_PROVIDER_virtual/libgl_mx6ul ?= "mesa" -PREFERRED_PROVIDER_virtual/libgl_mx6ull ?= "mesa" -PREFERRED_PROVIDER_virtual/libgl_mx7ulp ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgl_mx8mq ?= "imx-gpu-viv" - -PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-g2d" -PREFERRED_PROVIDER_virtual/libg2d_mx6sll ?= "" -PREFERRED_PROVIDER_virtual/libg2d_mx6ul = "" -PREFERRED_PROVIDER_virtual/libg2d_mx6ull = "" -PREFERRED_PROVIDER_virtual/libg2d_mx7ulp ?= "imx-gpu-viv" +# Graphics libraries +PREFERRED_PROVIDER_virtual/egl ?= "mesa" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa" +PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" +PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" + +PREFERRED_PROVIDER_virtual/egl_imxgpu ?= "imx-gpu-viv" +PREFERRED_PROVIDER_virtual/libgl_imxgpu3d ?= "imx-gpu-viv" +PREFERRED_PROVIDER_virtual/libgles1_imxgpu3d ?= "imx-gpu-viv" +PREFERRED_PROVIDER_virtual/libgles2_imxgpu3d ?= "imx-gpu-viv" +PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" PREFERRED_VERSION_weston_mx6 ?= "4.0.0.imx" PREFERRED_VERSION_weston_mx7 ?= "4.0.0.imx" -- 2.40.1