diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-17 10:29:59 +0300 |
|---|---|---|
| committer | Qt Gerrit Server <srv.gerrit-noreply@digia.com> | 2015-06-17 10:29:59 +0300 |
| commit | b8b197a757c4cc7cf013d169c82d77f2832ebc71 (patch) | |
| tree | 5665526b6a4a2fdc5db4d231c253ed7e45679e6d /src/doc/src/devices | |
| parent | 544a762ca529bf25ab8f475dab3d696faba6bdfe (diff) | |
| parent | f8738120d5085e13752e69fa9eb46bb10fcc8111 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into dev
Diffstat (limited to 'src/doc/src/devices')
| -rw-r--r-- | src/doc/src/devices/qtee-supported-devices.qdoc | 7 | ||||
| -rw-r--r-- | src/doc/src/devices/qtee-toradex-colibri-vf.qdoc | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/doc/src/devices/qtee-supported-devices.qdoc b/src/doc/src/devices/qtee-supported-devices.qdoc index 1b4cd4f..c11fd73 100644 --- a/src/doc/src/devices/qtee-supported-devices.qdoc +++ b/src/doc/src/devices/qtee-supported-devices.qdoc @@ -60,9 +60,12 @@ \list \li 256 MB of RAM \li 500 MHz CPU, 1 GHz preferred for 60-FPS velvet-smooth UI - \li OpenGL ES 2.0 support + \li OpenGL ES 2.0 support * \endlist + * On GPU-less hardware, \l {Qt Quick 2D Renderer} can replace the + OpenGL ES 2.0 requirement (with some limitations on graphics capabilities). + \section1 Supported Device Groups The reference devices are divided into three groups, based on level @@ -186,7 +189,7 @@ \li HDMI \li HW Accelerated \br Video Playback \li Virtual Keyboard - \li Qt WiFi Module + \li B2Qt WiFi Module \li B2Qt Utils Module \li OpenGL ES 2.0 \li Qt Quick \br 2D Renderer diff --git a/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc b/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc index 5c01753..5753256 100644 --- a/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc +++ b/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc @@ -56,15 +56,14 @@ sudo Boot2Qt-4.x/colibri-vf-eLinux/images/deploy.sh /dev/<device_name> \endcode - By default, the Toradex Colibri-VF devices boot from their internal eMMC. In order to boot from + By default, the Toradex Colibri VF devices boot from their internal NAND memory. In order to boot from an external SD card, the U-Boot needs to be modified. 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 - set bootcmd 'run sdboot; run ubiboot; run nfsboot;' - set sdboot 'run setup; setenv bootargs ${defargs} ${mmcargs} ${mtdparts} ${setupargs} ${vidargs}; echo Booting from MMC/SD card...; mmc part 0; fatload mmc 0:1 ${loadaddr} zImage && bootz' - save + run setupdate + run update_uboot \endcode Reset or power cycle the device to continue. |