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

3 files changed, 127 insertions, 0 deletions

diff --git a/src/doc/src/devices/qtee-bd-sl-imx6.qdoc b/src/doc/src/devices/qtee-bd-sl-imx6.qdoc
index e46882a..e6c90f8 100644
--- a/src/doc/src/devices/qtee-bd-sl-imx6.qdoc
+++ b/src/doc/src/devices/qtee-bd-sl-imx6.qdoc
@@ -100,6 +100,29 @@
          \endcode
     \endlist
 
+    \b {Setup for 1280×800 displays}
+
+    Boundary Devices offers 1280x800 LCD touch panels that require changes in U-Boot environment
+    variable to be correctly identified.
+
+    Use one of the two following options to enable the scripts boot the device
+    with correct display panel setting:
+
+    \list
+     \li Write a \c uEnv.txt file on to the boot partition of SD card with the following
+         content:
+
+         \badcode
+             panel=LDB-WXGA
+         \endcode
+
+     \li Access the device's console and run the following commands on the U-Boot prompt:
+         \badcode
+             U-Boot > setenv panel LDB-WXGA
+             U-Boot > saveenv
+         \endcode
+    \endlist
+
     \section1 Setting up USB Access
 
     \include b2qt-post-install-setup.qdocinc setting up usb access
diff --git a/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc b/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc
new file mode 100644
index 0000000..a0f2549
--- /dev/null
+++ b/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use the contact form at
+** http://www.qt.io
+**
+** 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 http://www.qt.io
+**
+****************************************************************************/
+/*!
+    \keyword Kontron SMARC-sAMX6i
+    \page qtee-preparing-hardware-smarc-samx6i.html
+    \title Preparing Kontron SMARC-sAMX6i
+    \previouspage qtee-installation-guide.html
+
+    Take the following steps to prepare a
+    \l{http://www.kontron.com/products/boards-and-standard-form-factors/smarc/smarc-samx6i.html}
+    {Kontron SMARC-sAMX6i} 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 Kontron SMARC-sAMX6i 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
+        cd <INSTALL_DIR>
+        sudo 5.5/Boot2Qt/apalis-imx6-eLinux/images/deploy.sh /dev/<device_name>
+    \endcode
+
+    By default, the Kontron SMARC-sAMX6i boots from its internal eMMC. In order to boot from
+    the external SD card, the U-Boot environment 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 mmcdev 1
+        setenv mmcpart 2
+        setenv bootcmd 'mmc dev ${mmcdev}; if mmc rescan; then if run loadfdt; then if run loaduimage; then run mmcboot; else run netboot; fi; else run netboot; fi; else run netboot; fi;'
+        setenv uimage /boot/uImage
+        setenv fdtfile /boot/imx6q-smx6-lcd.dtb
+        setenv mmcroot /dev/mmcblk0p2 rootwait rw
+        setenv mmcargs 'setenv bootargs video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 fbmem=28M console=${console},${baudrate} root=${mmcroot}'
+        saveenv
+    \endcode
+
+    New U-Boot commands are now stored into the device, and you can start \B2Q.
+
+    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
+
+    \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/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