aboutsummaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-09-17 16:13:24 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2012-09-17 16:13:24 -0300
commit5e84163b17defd5b3480b1c9757211c288ded27c (patch)
tree91deb292f8861ea6b333b0151d98c84355d20b4d /conf/machine
parent43cb4919a4ccd4718eb657b9f912c911825153fe (diff)
parentf2ce5b1a8963f5db971341d933657e7beeb19ef5 (diff)
downloadmeta-fsl-arm-5e84163b17defd5b3480b1c9757211c288ded27c.tar.gz
meta-fsl-arm-5e84163b17defd5b3480b1c9757211c288ded27c.tar.bz2
meta-fsl-arm-5e84163b17defd5b3480b1c9757211c288ded27c.zip
Merge remote branch 'freescale/denzil'
* freescale/denzil: imx6qsabrelite: Use xserver-xorg instead of xserver-xorg-lite cogl: Use OpenGL ES2 for mx5 SoCs imx-base.inc: Set preferred implementation of virtual/libgl for mx5 SoCs amd-gpu-x11-bin-mx51: Add provides to 'virtual/libgl'
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/imx6qsabrelite.conf6
-rw-r--r--conf/machine/include/imx-base.inc2
2 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/imx6qsabrelite.conf b/conf/machine/imx6qsabrelite.conf
index 2528142..e10229a 100644
--- a/conf/machine/imx6qsabrelite.conf
+++ b/conf/machine/imx6qsabrelite.conf
@@ -10,15 +10,13 @@ SOC_FAMILY = "mx6"
KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabrelite.dts"
-# no GST until codecs are public
-MACHINE_GSTREAMER_PLUGIN = ""
-
UBOOT_ENTRYPOINT = "0x10800000"
UBOOT_LOADADDRESS = "0x10800000"
UBOOT_MACHINE = "mx6qsabrelite_config"
# Needs to override until all BSP is public
-XSERVER = "xserver-xorg-lite \
+MACHINE_GSTREAMER_PLUGIN = ""
+XSERVER = "xserver-xorg \
xf86-input-evdev \
xf86-video-fbdev"
MACHINE_EXTRA_RRECOMMENDS = "kernel-modules \
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 33be4c4..1145709 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -28,6 +28,8 @@ MACHINE_EXTRA_RRECOMMENDS += "imx-audio \
# Gstreamer plugin
MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
+PREFERRED_PROVIDER_virtual/libgl_mx5 ?= "amd-gpu-x11-bin-mx51"
+
EXTRA_IMAGEDEPENDS = "u-boot"
SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"