summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-10-18 06:33:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-19 17:38:50 +0100
commit93ecafc466129289541699a3c2312987efaac345 (patch)
tree1147a80800f064c5c60fef0d589d92c23f24df46
parentf5ea427fa5e34993b385f56a3c57a7db94b6629d (diff)
downloadast2050-yocto-poky-93ecafc466129289541699a3c2312987efaac345.zip
ast2050-yocto-poky-93ecafc466129289541699a3c2312987efaac345.tar.gz
documentation: poky-ref-manual - Updates to MACHINE glossary entry.
(From yocto-docs rev: 666562a428f5db2b2fc18c7cd21d17247479b24c) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/poky-ref-manual/ref-variables.xml17
1 files changed, 10 insertions, 7 deletions
diff --git a/documentation/poky-ref-manual/ref-variables.xml b/documentation/poky-ref-manual/ref-variables.xml
index 50e3400..163d1c0 100644
--- a/documentation/poky-ref-manual/ref-variables.xml
+++ b/documentation/poky-ref-manual/ref-variables.xml
@@ -1420,8 +1420,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
<filename>local.conf</filename> file found in the
<ulink url='&YOCTO_DOCS_DEV_URL;#build-directory'>Build Directory</ulink>.
By default, <filename>MACHINE</filename> is set to
- "qemux86", which is a basic x86 architecture to be run on
- the emulator (QEMU):
+ "qemux86", which is an x86-based architecture machine to
+ be emulated using QEMU:
<literallayout class='monospaced'>
MACHINE ?= "qemux86"
</literallayout>
@@ -1435,9 +1435,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
</para>
<para>
- The possible settings for <filename>MACHINE</filename> that ship with
- the Yocto Project as defined in the <filename>local.conf</filename>
- include the following:
+ The list of machines supported by the Yocto Project as
+ shipped include the following:
<literallayout class='monospaced'>
MACHINE ?= "qemuarm"
MACHINE ?= "qemumips"
@@ -1449,8 +1448,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
MACHINE ?= "mpc8315e-rdb"
MACHINE ?= "routerstationpro"
</literallayout>
- The last four are target machines for hardware boards used
- for demonstration.
+ The last four are Yocto Project reference hardware boards, which
+ are provided in the <filename>meta-yocto-bsp</filename> layer.
+ <note>Adding additional Board Support Package (BSP) layers
+ to your configuration adds new possible settings for
+ <filename>MACHINE</filename>.
+ </note>
</para>
</glossdef>
</glossentry>
OpenPOWER on IntegriCloud