From 257667225acd8a6e755dc1cffa4dc22200165779 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 14 Dec 2012 11:01:11 +0100 Subject: [PATCH] imx-digi-base: fix mx5 GPU library API support The mx5 GPU libraries provide OpenGL ES1, OpenEGL and OpenGL ES2 only so we need to ajust the PREFERRED_PROVIDER. There is an equivalent commit in FSL layer. Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/digi-defaults.inc | 7 ++++--- meta-digi-arm/conf/machine/include/imx-digi-base.inc | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index efee63b5c..1b0dfd644 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -1,12 +1,13 @@ # Digi BSP default providers - PREFERRED_PROVIDER_virtual/kernel = "linux-imx" PREFERRED_PROVIDER_u-boot = "u-boot-imx" -# Digi BSP default settings +PREFERRED_PROVIDER_virtual/egl_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}" +PREFERRED_PROVIDER_virtual/libgles1_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}" +PREFERRED_PROVIDER_virtual/libgles2_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}" +# Digi BSP default settings IMAGE_CLASSES += "image_types_digi" # Digi BSP default versions - PREFERRED_VERSION_udev = "175" diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index 45d2b696f..71378c2a7 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -9,7 +9,4 @@ include conf/machine/include/digi-defaults.inc UBOOT_MAKE_TARGET = "u-boot.bin" UBOOT_SUFFIX = "bin" -PREFERRED_PROVIDER_virtual/libgl_ccxmx51js = "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}" -PREFERRED_PROVIDER_virtual/libgl_ccxmx53js = "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}" - IMAGE_FSTYPES = "jffs2 tar.bz2 ext3 sdcard"