summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Remmet <j.remmet@phytec.de>2016-12-06 14:27:13 +0100
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2016-12-09 15:12:36 +0100
commit656331f64eb225e9574f6243d980ff6c160b8527 (patch)
tree606751b4c7bd7c97d78b5a0cb675ff611964ac96
parentf42f86b5262794a45a8960dba8c0fb4834591370 (diff)
downloadmeta-phytec-656331f64eb225e9574f6243d980ff6c160b8527.tar.bz2
meta-phytec-656331f64eb225e9574f6243d980ff6c160b8527.zip
imx6: qtbase: seperate config for imx6qdl and imx6ul
Add MACHINEOVERRIDES imxgpu3d and imxpxp Use imxgpu3d for the qtbase openGL(ES) config Signed-off-by: Jan Remmet <j.remmet@phytec.de> Reviewed-by: Stefan Lengfeld <s.lengfeld@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--conf/machine/include/phyimx6qdl.inc3
-rw-r--r--conf/machine/include/phyimx6ul.inc3
-rw-r--r--qt5-layer/recipes-qt/qt5/qtbase_%.bbappend5
3 files changed, 9 insertions, 2 deletions
diff --git a/conf/machine/include/phyimx6qdl.inc b/conf/machine/include/phyimx6qdl.inc
index cd9cbe5..44c7212 100644
--- a/conf/machine/include/phyimx6qdl.inc
+++ b/conf/machine/include/phyimx6qdl.inc
@@ -11,6 +11,9 @@ SERIAL_CONSOLES ?= "115200;ttymxc3"
MACHINE_SOCARCH = "${TUNE_PKGARCH}-mx6qdl"
PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
+# cpu feature overwrite support
+MACHINEOVERRIDES .= ":imxgpu3d"
+
# Use the expected value of the ubifs filesystem's volume name in the kernel
UBI_VOLNAME = "root"
# The biggest NANDs on current modules are 1GB. With current partition layout,
diff --git a/conf/machine/include/phyimx6ul.inc b/conf/machine/include/phyimx6ul.inc
index 0381760..72c416f 100644
--- a/conf/machine/include/phyimx6ul.inc
+++ b/conf/machine/include/phyimx6ul.inc
@@ -11,6 +11,9 @@ SERIAL_CONSOLES ?= "115200;ttymxc0"
MACHINE_SOCARCH = "${TUNE_PKGARCH}-mx6ul"
PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
+# cpu feature overwrite support
+MACHINEOVERRIDES .= ":imxpxp"
+
# Use the expected value of the ubifs filesystem's volume name in the kernel
UBI_VOLNAME = "root"
# The biggest NANDs on current modules are 1GB. With current partition layout,
diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 9d4f1b6..1bf15e1 100644
--- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -2,7 +2,8 @@
# The string 'gl' is in PACKAGECONFIG because "opengl" is in yogurt's
# DISTRO_FEATURES. Since our boards only support egl/gles2 and not the full
# opengl, we have to disable gl and enable gles2 by hand here.
-PACKAGECONFIG_GL_mx6 = "gles2 eglfs"
+PACKAGECONFIG_GL_mx6ul = "linuxfb"
+PACKAGECONFIG_GL_imxgpu3d = "gles2 eglfs"
PACKAGECONFIG_GL_ti33x = "gles2 eglfs"
PACKAGECONFIG_GL_rk3288 = "gles2 eglfs kms"
@@ -10,7 +11,7 @@ PACKAGECONFIG_GL_rk3288 = "gles2 eglfs kms"
PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/egl"
# From the layer meta-fsl-arm. Fix qtbase build.
-do_configure_prepend_mx6() {
+do_configure_prepend_imxgpu3d() {
# adapt qmake.conf to our needs
sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf