diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-01-13 15:58:52 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-01-13 15:59:46 +0200 |
| commit | 6217a1cae7e0f5fcfa93d80051237fa835412903 (patch) | |
| tree | 2f2d93b8aa0160c00e323da24636e91455d0b155 /src/doc/src/devices/qtee-supported-devices.qdoc | |
| parent | 9bad5168e006b37e5b1634ac68085b587846febb (diff) | |
| parent | 1145b7fe7db9dc2ae216aa90d4c99473a25a838e (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
* origin/5.5:
docs: add note about need for kontron's Yocto BSP
Doc: Bump version to 5.5.1
Doc: Add ChangeLog for 5.5.1
doc: add documentation for Kontron SMARC-sAMX6i
Doc: Add a custom note on the online landing page
doc: instructions how to use BD's 1280x800 panels
Doc: Clarify the network type for Emulator
Conflicts:
src/doc/config/b2qt-project.qdocconf
src/doc/src/devices/qtee-supported-devices.qdoc
src/doc/src/qtee-index.qdoc
Change-Id: I912a1175965a44c5ff5d68ca5ea9be2d6928b595
Diffstat (limited to 'src/doc/src/devices/qtee-supported-devices.qdoc')
| -rw-r--r-- | src/doc/src/devices/qtee-supported-devices.qdoc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/doc/src/devices/qtee-supported-devices.qdoc b/src/doc/src/devices/qtee-supported-devices.qdoc index 04d6203..360c940 100644 --- a/src/doc/src/devices/qtee-supported-devices.qdoc +++ b/src/doc/src/devices/qtee-supported-devices.qdoc @@ -34,6 +34,7 @@ \li \l{Toradex Colibri iMX6} \li \l{Toradex Colibri VF50 and VF61} \li \l{ArchiTech Tibidabo} + \li \l{Kontron SMARC-sAMX6i} \li \l{BeagleBone Black} \li \l{Raspberry Pi 2 Model B} \endlist @@ -150,6 +151,10 @@ 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 + \row \li \l{http://www.kontron.com/products/boards-and-standard-form-factors/smarc/smarc-samx6i.html} + {Kontron SMARC-sAMX6i}\br + Freescale® i.MX 6 ARM Cortex™-A9 @800MHz - 1.2GHz,\br + 2GB DDR3, 2-64GB eMMC, Vivante GC2000 GPU \row \li \l{https://www.raspberrypi.org/products/raspberry-pi-2-model-b/} {Raspberry Pi 2 Model B}\br 900 Mhz ARM Cortex™-A7, Broadcom VideoCore IV\br @@ -284,6 +289,17 @@ \li \image ok \li \image ok \li + \row \li Kontron SMARC-sAMX6i + \li \image ok + \li \image ok + \li \image ok + \li \image ok + \li \image ok + \li \image ok + \li \image ok + \li \image ok + \li \image ok + \li \row \li Raspberry Pi 2 \li \image ok \li \image ok |