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/qtee-custom-embedded-linux.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/qtee-custom-embedded-linux.qdoc')
| -rw-r--r-- | src/doc/src/qtee-custom-embedded-linux.qdoc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/doc/src/qtee-custom-embedded-linux.qdoc b/src/doc/src/qtee-custom-embedded-linux.qdoc index 0064e35..5d2a577 100644 --- a/src/doc/src/qtee-custom-embedded-linux.qdoc +++ b/src/doc/src/qtee-custom-embedded-linux.qdoc @@ -84,6 +84,9 @@ <INSTALL_DIR>/5.6/Boot2Qt/sources/b2qt-yocto-meta/b2qt-init-build-env help \endcode + \note Support for Kontron SMARC-sAMX6i requires additional Yocto Board Support Package that is + downloadable from \l{http://emdcustomersection.kontron.com/?page_id=2750}{Kontron Customer Section}. + \section1 Building the Image and Toolchain After the Yocto environment is set up, you need to configure the @@ -131,6 +134,9 @@ \li SILICA ArchiTech Tibidabo \li tibidabo \row + \li Kontron SMARC-sAMX6i + \li smarc-smax6i + \row \li Emulator \li emulator \endtable |