Add Support for Colibri-VF devices

Change-Id: Ie4fdf57b986eb24cb16dfb9f347ae02e7648bf86
Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>

4 files changed, 47 insertions, 3 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 8b7dee3..b1a13ab 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -82,7 +82,7 @@ get_repo() {
 
 get_groups() {
   case ${DEVICE} in
-    apalis-imx6)
+    apalis-imx6|colibri-vf)
       PROJECT_GROUPS="toradex"
     ;;
     imx53qsb|imx6qsabresd|nitrogen6x)
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
new file mode 100644
index 0000000..c5a3343
--- /dev/null
+++ b/conf/distro/include/colibri-vf.conf
@@ -0,0 +1,44 @@
+#############################################################################
+##
+## 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://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+include conf/distro/include/toradex.inc
+
+IMAGE_FSTYPES = "tar.gz"
+
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    u-boot-${MACHINE}.imx:u-boot.imx \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy"
+
+ADB_PRODUCTID = "0x0000"
+
+SERIAL_CONSOLES = "115200;ttymxc0 \
+                   115200;ttymxc1"
+
+MACHINE_EXTRA_INSTALL = "\
+        opengldummy \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = "\
+        opengldummy-dev \
+        "
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend
index aa33199..3d32eb9 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend
@@ -21,6 +21,6 @@
 #############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += " \
+SRC_URI_apalis-imx6 += " \
         file://0001-Update-default-args-for-apalis-imx6.patch \
         "
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 16815a8..d4bb051 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -49,7 +49,7 @@ BUILDDIR=${BUILDDIR:-build-${MACHINE}}
 
 if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then
   case ${MACHINE} in
-    apalis-imx6)
+    apalis-imx6|colibri-vf)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
     imx53qsb|imx6qsabresd|nitrogen6x)