summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2014-04-14 15:39:21 +0200
committerLaszlo Agocs <laszlo.agocs@digia.com>2014-04-14 17:17:57 +0300
commitac91a7d0fb40a8caaff80a8f477428265c8f0a78 (patch)
tree71b306bb0c3cc7865207822888a6c909029a6568
parentf9da7d90608cb4ce511770f5da8ef666e8a3e1b0 (diff)
Doc: Relocate unmount instructions
This change relocates the step to unmount the partitions from 'Preparing an SD Card' to be the first step in deploying the Boot to Qt image. Change-Id: If256848aaf4b24108b62902f3c7d3d1c6bee3d72 Reviewed-by: Rainer Keller <rainer.keller@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
-rw-r--r--src/doc/src/b2qt.qdoc39
-rw-r--r--src/doc/src/detect-sd-card-device-name.qdocinc12
2 files changed, 38 insertions, 13 deletions
diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc
index 7e7bad4..c232965 100644
--- a/src/doc/src/b2qt.qdoc
+++ b/src/doc/src/b2qt.qdoc
@@ -460,7 +460,12 @@
\section1 Installing the \B2Q Image
- To write the image to the SD card:
+ 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>
@@ -539,8 +544,13 @@
sudo apt-get install u-boot-tools
\endcode
- Then, upgrade the SD card with \B2Q. Use one of the commands below,
- depending on whether you are developing for embedded Android or Linux:
+ Then, upgrade the SD card with \B2Q. First, ensure that no partitions on the
+ SD card are mounted:
+
+ \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}
@@ -599,7 +609,12 @@
\section1 Installing the \B2Q Image
- To write the image to the SD card:
+ 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>
@@ -665,8 +680,13 @@
\section1 Installing the \B2Q Image
- Then, upgrade the SD card with \B2Q. Use one of the commands below,
- depending on whether you are developing for embedded Android or Linux:
+ Then, upgrade the SD card with \B2Q. First, ensure that no partitions on the
+ SD card are mounted:
+
+ \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}
@@ -725,7 +745,12 @@
\section1 Installing the \B2Q Image
- To write the image to the SD card:
+ 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 <QtBuildDir>
diff --git a/src/doc/src/detect-sd-card-device-name.qdocinc b/src/doc/src/detect-sd-card-device-name.qdocinc
index 5f9803b..b74947d 100644
--- a/src/doc/src/detect-sd-card-device-name.qdocinc
+++ b/src/doc/src/detect-sd-card-device-name.qdocinc
@@ -21,7 +21,7 @@
Plug in the SD card or reader to the development host,
and use the following command to find out its device name:
- \code
+ \badcode
lsblk -d
\endcode
@@ -34,12 +34,12 @@
Typical device names for SD cards include \c {sdb} and
\c {mmcblk0}. The full device path is \c {/dev/} followed by
the name.
+//! [instructions]
- To make sure that the SD card is not mounted, enter the following
- command, where <device_name> is the device name:
-
- \code
+//! [unmount]
+ \badcode
umount /dev/<device_name>
\endcode
-//! [instructions]
+//! [unmount]
+
*/