From 88ec6565868772531ade2fbc896eec4f718222b6 Mon Sep 17 00:00:00 2001 From: aavit Date: Mon, 24 Nov 2014 12:47:07 +0100 Subject: Doc: Drop eAndroid platform for BBB MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1a48f7f049b48653300731fce3fb08a3129081b0 Reviewed-by: Topi Reiniö --- src/doc/src/devices/qtee-beaglebone-black.qdoc | 52 +++++-------------------- src/doc/src/devices/qtee-supported-devices.qdoc | 15 ++++++- src/doc/src/qtee-index.qdoc | 2 +- 3 files changed, 23 insertions(+), 46 deletions(-) (limited to 'src/doc/src') diff --git a/src/doc/src/devices/qtee-beaglebone-black.qdoc b/src/doc/src/devices/qtee-beaglebone-black.qdoc index d05d54f..ea7d745 100644 --- a/src/doc/src/devices/qtee-beaglebone-black.qdoc +++ b/src/doc/src/devices/qtee-beaglebone-black.qdoc @@ -17,7 +17,7 @@ ** ****************************************************************************/ /*! - \target BeagleBone Black (embedded Android and Linux) + \target BeagleBone Black (embedded Linux) \page qtee-preparing-hardware-beaglebone.html \title Preparing BeagleBone Black \previouspage qtee-installation-guide.html @@ -33,35 +33,10 @@ \section1 Preparing an SD Card - For \B2QA, an SD card of at least 2 GB capacity is needed. For \B2QL, - a card of at least 1 GB capacity is sufficient. + An SD card of at least 1 GB capacity is sufficient. \include detect-sd-card-device-name.qdocinc instructions - \section1 Installing the Android Image - - \e{If installing} \B2QL, \e{you can skip this step and proceed to} - \l{#Installing the Boot to Qt Image}{Installing the Boot to Qt Image}. - - Download the package \e{TI_Android_JB_4.2.2_DevKit_4.1.1_beagleboneblack.tar.gz} from - \l{http://downloads.ti.com/sitara_android/esd/TI_Android_DevKit/TI_Android_JB_4_2_2_DevKit_4_1_1/index_FDS.html} - {Texas Instruments} (search for \e {BeagleBone Black} in the list of download packages). - - Use the following commands to create an SD card containing the - downloaded image: - - \list 1 - \li Extract the downloaded package: - \badcode - ~$ tar zxvf ~/Downloads/TI_Android_JB_4.2.2_DevKit_4.1.1_beagleboneblack.tar.gz - \endcode - \li Run beagleboneblack/mkmmc-android.sh: - \badcode - ~$ cd beagleboneblack - ~/beagleboneblack$ sudo ./mkmmc-android.sh /dev/ - \endcode - \endlist - \section1 Installing the \B2Q Image \include common.qdocinc wizard @@ -70,21 +45,12 @@ \include detect-sd-card-device-name.qdocinc unmount - Then, use one of the commands below, depending on whether you are developing - for embedded Android or Linux: - - \list - \li \b{\B2QA} - \badcode - cd - ./Boot2Qt-4.x/generic-4.2-eAndroid/images/beaglebone/deploy.sh - \endcode - \li \b{\B2QL} - \badcode - cd - sudo ./Boot2Qt-4.x/beaglebone-eLinux/images/deploy.sh /dev/ - \endcode - \endlist + Then, use the following command: + + \badcode + cd + sudo ./Boot2Qt-4.x/beaglebone-eLinux/images/deploy.sh /dev/ + \endcode After the installation is complete, insert the SD card, power on the device and check that the \B2Q welcome screen and/or demo appear. @@ -95,7 +61,7 @@ \section1 Configuring a Device Kit in Qt Creator - \include b2qt-post-install-setup.qdocinc configuring device kit android linux + \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 74a7df3..78fca3f 100644 --- a/src/doc/src/devices/qtee-supported-devices.qdoc +++ b/src/doc/src/devices/qtee-supported-devices.qdoc @@ -32,7 +32,7 @@ \li \l{Boundary Devices i.MX6 Boards} \li \l{SABRE SD i.MX6Quad (embedded Linux)} \li \l{Toradex Apalis iMX6 (embedded Linux)} - \li \l{BeagleBone Black (embedded Android and Linux)} + \li \l{BeagleBone Black (embedded Linux)} \li \l{BeagleBoard-xM (embedded Linux)} \li \l{Raspberry Pi Model B (embedded Linux)} \endlist @@ -63,7 +63,9 @@ \endlist \B2QA requires hardware that has support for the Android operating - system, version 4.2 or later. + system, version 4.2 or later. For rapid prototyping or feasibility testing, + it is possible to install it on most programmable Android devices using + \l {Android injection}. \B2Q software stack is provided pre-built, tested and supported for the following hardware: @@ -167,6 +169,15 @@ tested and supported. It is, however, still tested and supported in the earlier 2.x releases. \endlist + \li \l{http://beagleboard.org/products/beaglebone%20black} + {BeagleBone Black} (embedded Android) + \list + \li Starting from \SDK 4.0 release, the embedded Android platform + is no longer tested and supported on the BeagleBone Black. It is, + however, still tested and supported in the earlier 3.x releases. + Also, it possible to install \B2QA on it using \l {Android injection}. + Note: Embedded Linux is still supported on the BeagleBone Black. + \endlist \endlist \section1 Supported Development Environment diff --git a/src/doc/src/qtee-index.qdoc b/src/doc/src/qtee-index.qdoc index 2d5396b..e90f6bc 100644 --- a/src/doc/src/qtee-index.qdoc +++ b/src/doc/src/qtee-index.qdoc @@ -48,7 +48,7 @@ \li \l{Boundary Devices i.MX6 Boards} \li \l{Preparing SABRE SD i.MX6Quad}{SABRE SD i.MX6Quad (embedded Linux)} \li \l{Preparing Toradex Apalis iMX6}{Toradex Apalis iMX6 (embedded Linux)} - \li \l{Preparing BeagleBone Black}{BeagleBone Black (embedded Android and Linux)} + \li \l{Preparing BeagleBone Black}{BeagleBone Black (embedded Linux)} \li \l{Preparing BeagleBoard-xM}{BeagleBoard-xM (embedded Linux)} \li \l{Preparing Raspberry Pi}{Raspberry Pi Model B (embedded Linux)} \endlist -- cgit v1.2.3