Add support for Toradex Colibri iMX6

Uses Colibri form factor instead of Apalis.

Change-Id: I7ba54323a82b151ce174f06477851523b283297b
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

5 files changed, 87 insertions, 2 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index cb40b6b5..c61e0c64 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -85,7 +85,7 @@ get_groups() {
     all)
       PROJECT_GROUPS="all"
     ;;
-    apalis-imx6|colibri-vf)
+    apalis-imx6|colibri-imx6|colibri-vf)
       PROJECT_GROUPS="toradex"
     ;;
     imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x)
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
new file mode 100644
index 00000000..1171c5f1
--- /dev/null
+++ b/conf/distro/include/colibri-imx6.conf
@@ -0,0 +1,47 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+include conf/distro/include/toradex.inc
+
+KERNEL_IMAGETYPE = "uImage"
+
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-${KERNEL_DEVICETREE}:${KERNEL_DEVICETREE} \
+    u-boot-${MACHINE}.imx:u-boot.imx \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
+
+MACHINE_EXTRA_INSTALL = "\
+        libgal-mx6 \
+        libegl-mx6 \
+        libgles2-mx6 \
+        gst-fsl-plugin \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        libgal-mx6 \
+        libegl-mx6 \
+        libegl-mx6-dev \
+        libgles2-mx6 \
+        libgles2-mx6-dev \
+        "
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch b/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch
new file mode 100644
index 00000000..719a38d5
--- /dev/null
+++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch
@@ -0,0 +1,32 @@
+From 7515eb259a380578540323be5d4913245e81c454 Mon Sep 17 00:00:00 2001
+From: Andy Nichols <andy.nichols@theqtcompany.com>
+Date: Mon, 13 Apr 2015 12:54:17 +0200
+Subject: [PATCH] Colibri-iMX6: set 1280x720@16 for HDMI by default
+
+---
+ arch/arm/boot/dts/imx6qdl-colibri.dtsi | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+index e638266..dd8b21fc5 100644
+--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+@@ -70,12 +70,11 @@
+ 		compatible = "fsl,mxc_sdc_fb";
+ 		disp_dev = "hdmi";
+ 		interface_pix_fmt = "RGB24";
+-		mode_str ="1920x1080M@60";
+-/*		default_bpp = <16>;*/
+-		default_bpp = <24>;
++		mode_str ="1280x729M@60";
++		default_bpp = <16>;
+ 		int_clk = <0>;
+ 		late_init = <0>;
+-		status = "disabled";
++		status = "okay";
+ 	};
+ 
+ 	mxcfb2: fb@1 {
+-- 
+2.3.5
+
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
index 68cdfc26..5de3f197 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
+++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
@@ -26,6 +26,12 @@ SRC_URI += "\
     file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \
     "
 
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+        file://0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch \
+        "
+
 # kernel image files are not needed in the image
 RDEPENDS_kernel-base = ""
 
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 3439d904..26c374d2 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -49,7 +49,7 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}
 
 if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   case ${MACHINE} in
-    apalis-imx6|colibri-vf)
+    apalis-imx6|colibri-imx6|colibri-vf)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
     imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x)