diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-16 16:23:32 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-16 16:23:32 +0300 |
commit | f8738120d5085e13752e69fa9eb46bb10fcc8111 (patch) | |
tree | 933c3ae0a03354a0e7e17832956672db040602a4 /src/doc/src/devices | |
parent | 0e0f5e8bb841c588d323b76042c970745d0904c6 (diff) | |
parent | fc10269ca529489dd38a99320dee6046c441074c (diff) |
Merge remote-tracking branch 'origin/stable' into dev
* origin/stable:
Doc: Bump version to 4.2.0
Doc: ChangeLog for release 4.2.0
doc: simpler uboot command for colibri vf
doc: Update colibri vf instructions
b2qt-flashing-wizard: Remove unused variables
b2qt-flashing-wizard: Files are now located at a different location
b2qt-flashing-wizard: Script standard error in red color
b2qt-flashing-wizard: Hints for users to find error messages more easily
Doc: ChangeLog: Update 4.1.0 release date
Doc: Update minimal hardware requirements
Doc: Fix issues in Wifi module documentation
Doc: Bump version to 4.1.0
Doc: Update the list of required packages for BYOS
Doc: Rename instances of 'Digia' to 'The Qt Company'
Doc: Move Toradex Colibri VF61 to Supported Device Group 1
Doc: Updated copyright license holder in documentation footer
Doc: Add table of contents in the sidebar
Doc: Move 'Value-Add Components' list to the overview page
Doc: ChangeLog for 4.1.0 release
b2qt-flashing-wizard: Disable next page when no platforms found
Conflicts:
src/doc/config/b2qt.qdocconf
src/doc/src/devices/qtee-supported-devices.qdoc
src/doc/src/qtee-changelog.qdoc
src/doc/src/qtee-index.qdoc
src/wifi/qwifimanager.cpp
Change-Id: I00ecc61a1e9eea6dd26ecc9a568f07cd64a6296a
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. |