diff options
4 files changed, 114 insertions, 1 deletions
diff --git a/src/doc/src/devices/qtee-supported-devices.qdoc b/src/doc/src/devices/qtee-supported-devices.qdoc
index d955133..fd829cf 100644
--- a/src/doc/src/devices/qtee-supported-devices.qdoc
+++ b/src/doc/src/devices/qtee-supported-devices.qdoc
@@ -32,6 +32,7 @@
\li \l{SABRE SD i.MX6Quad (embedded Linux)}
\li \l{SABRE SD i.MX6Dual (embedded Linux)}
\li \l{Toradex Apalis iMX6 (embedded Linux)}
+ \li \l{Toradex Colibri iMX6 (embedded Linux)}
\li \l{Toradex Colibri VF50 and VF61 (embedded Linux)}
\li \l{ArchiTech Tibidabo (embedded Linux)}
\li \l{BeagleBone Black (embedded Linux)}
@@ -153,6 +154,12 @@
Freescale® i.MX 6Q ARM Cortex™-A9 @1 GHz,\br
1GB DDR3, 4GB eMMC, Vivante GC2000 GPU
\li \image ok
+ \row \li \l{}
+ {Toradex Colibri iMX6}\br
+ Freescale® i.MX6S or i.MX6DL ARM Cortex™-A9 @800MHz - 1GHz,\br
+ 256MB (single core), 512MB (dual core) DDR3, 4GB eMMC,\br
+ Vivante 2D/3D GPU
+ \li \image ok
\row \li \l{}
{Raspberry Pi 2 Model B}\br
900 Mhz ARM Cortex™-A7, Broadcom VideoCore IV\br
@@ -278,7 +285,7 @@
\li \image ok
\li \image ok
- \row \li Toradex Apalis i.MX6
+ \row \li Toradex Apalis/Colibri i.MX6
\li \image ok
\li \image ok
\li \image ok
diff --git a/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc b/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
new file mode 100644
index 0000000..475a05e
--- /dev/null
+++ b/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
@@ -0,0 +1,102 @@
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use the contact form at
+** This file is part of Qt Enterprise Embedded.
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+** If you have questions regarding the use of this file, please use
+** the contact form at
+ \target Toradex Colibri iMX6 (embedded Linux)
+ \page qtee-preparing-hardware-colibri-imx6.html
+ \title Preparing Toradex Colibri iMX6
+ \previouspage qtee-installation-guide.html
+ Take the following steps to prepare a
+ \l{}
+ {Toradex Colibri iMX6} for \B2Q.
+ \note It is important that you repeat the steps in this section after you
+ update \SDK.
+ The images containing the \B2Q stack for Toradex Colibri iMX6 are included
+ in \SDK, ready to be copied to an SD card.
+ \section1 Preparing an SD Card
+ An SD card of at least 1 GB capacity is sufficient.
+ \include detect-sd-card-device-name.qdocinc instructions
+ \section1 Installing the \B2Q Image
+ \include common.qdocinc wizard
+ To write the image to the SD card, ensure that no partitions on the
+ SD card are mounted:
+ \include detect-sd-card-device-name.qdocinc unmount
+ Then,
+ \badcode
+ sudo 5.5/Boot2Qt/colibri-imx6-eLinux/images/ /dev/<device_name>
+ \endcode
+ By default, the Toradex Colibri iMX6 boots from its internal eMMC. In order to boot from
+ the external SD card, the U-Boot needs to be updated. Connect a serial cable
+ to the device and enter into the U-Boot environment by pressing any key before the autoboot.
+ Enter following commands into U-Boot:
+ \badcode
+ setenv drive 2
+ setenv setupdate 'fatload mmc ${drive}:1 ${loadaddr} flash_mmc.img; source'
+ run setupdate
+ run update_uboot
+ \endcode
+ Reset or power cycle the device to start the new U-Boot.
+ To reset the U-Boot environment to new default values, enter the following commands
+ in the U-Boot command line
+ \badcode
+ env default -a
+ saveenv
+ \endcode
+ New U-Boot commands are now stored into the device, and you can start \B2Q. For more information
+ about the boot process on Toradex Colibri iMX6, see
+ \l{}{Toradex Linux Booting}.
+ After the image has been deployed, insert the SD card, power on the device and check that
+ the \B2Q welcome screen and/or demo appear.
+ \section1 Setting up USB Access
+ The \l {}
+ {carrier boards} for Toradex Colibri iMX6 include a USB 2.0 port
+ that can be used for an \c adb connection between the device and the
+ development host.
+ \include b2qt-post-install-setup.qdocinc setting up usb access
+ \section1 Configuring a Device Kit in Qt Creator
+ \include b2qt-post-install-setup.qdocinc configuring device kit
+ You are now ready to start developing for your device. For more information,
+ see \l{Building and Running an Example}.
diff --git a/src/doc/src/qtee-custom-embedded-linux.qdoc b/src/doc/src/qtee-custom-embedded-linux.qdoc
index 0c730c1..df156bd 100644
--- a/src/doc/src/qtee-custom-embedded-linux.qdoc
+++ b/src/doc/src/qtee-custom-embedded-linux.qdoc
@@ -123,6 +123,9 @@
\li Toradex Apalis iMX6
\li apalis-imx6
+ \li Toradex Colibri iMX6
+ \li colibri-imx6
+ \row
\li Toradex Colibri VF
\li colibri-vf
diff --git a/src/doc/src/qtee-index.qdoc b/src/doc/src/qtee-index.qdoc
index 4d571fd..3ea844a 100644
--- a/src/doc/src/qtee-index.qdoc
+++ b/src/doc/src/qtee-index.qdoc
@@ -47,6 +47,7 @@
\li \l{Preparing SABRE SD i.MX6}{SABRE SD i.MX6Quad (embedded Linux)}
\li \l{Preparing SABRE SD i.MX6}{SABRE SD i.MX6Dual (embedded Linux)}
\li \l{Preparing Toradex Apalis iMX6}{Toradex Apalis iMX6 (embedded Linux)}
+ \li \l{Preparing Toradex Colibri iMX6}{Toradex Colibri iMX6 (embedded Linux)}
\li \l{Preparing Toradex Colibri VF50 and VF61}{Toradex Colibri VF50 and VF61 (embedded Linux)}
\li \l{Preparing ArchiTech Tibidabo}{ArchiTech Tibidabo (embedded Linux)}
\li \l{Preparing BeagleBone Black}{BeagleBone Black (embedded Linux)}