summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-10-18 13:33:17 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-19 16:38:55 (GMT)
commitcc345014baaf8edb99234eb3573d96c8013a7e14 (patch)
tree6841328f960940d9b8dc653a3d5a7d99ee72ac43 /documentation
parented96f96db04126d1b1844d1890a73e80e7d14df6 (diff)
downloadpoky-cc345014baaf8edb99234eb3573d96c8013a7e14.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>
Diffstat (limited to 'documentation')
-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"
1420 <filename>local.conf</filename> file found in the 1420 <filename>local.conf</filename> file found in the
1421 <ulink url='&YOCTO_DOCS_DEV_URL;#build-directory'>Build Directory</ulink>. 1421 <ulink url='&YOCTO_DOCS_DEV_URL;#build-directory'>Build Directory</ulink>.
1422 By default, <filename>MACHINE</filename> is set to 1422 By default, <filename>MACHINE</filename> is set to
1423 "qemux86", which is a basic x86 architecture to be run on 1423 "qemux86", which is an x86-based architecture machine to
1424 the emulator (QEMU): 1424 be emulated using QEMU:
1425 <literallayout class='monospaced'> 1425 <literallayout class='monospaced'>
1426 MACHINE ?= "qemux86" 1426 MACHINE ?= "qemux86"
1427 </literallayout> 1427 </literallayout>
@@ -1435,9 +1435,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
1435 </para> 1435 </para>
1436 1436
1437 <para> 1437 <para>
1438 The possible settings for <filename>MACHINE</filename> that ship with 1438 The list of machines supported by the Yocto Project as
1439 the Yocto Project as defined in the <filename>local.conf</filename> 1439 shipped include the following:
1440 include the following:
1441 <literallayout class='monospaced'> 1440 <literallayout class='monospaced'>
1442 MACHINE ?= "qemuarm" 1441 MACHINE ?= "qemuarm"
1443 MACHINE ?= "qemumips" 1442 MACHINE ?= "qemumips"
@@ -1449,8 +1448,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
1449 MACHINE ?= "mpc8315e-rdb" 1448 MACHINE ?= "mpc8315e-rdb"
1450 MACHINE ?= "routerstationpro" 1449 MACHINE ?= "routerstationpro"
1451 </literallayout> 1450 </literallayout>
1452 The last four are target machines for hardware boards used 1451 The last four are Yocto Project reference hardware boards, which
1453 for demonstration. 1452 are provided in the <filename>meta-yocto-bsp</filename> layer.
1453 <note>Adding additional Board Support Package (BSP) layers
1454 to your configuration adds new possible settings for
1455 <filename>MACHINE</filename>.
1456 </note>
1454 </para> 1457 </para>
1455 </glossdef> 1458 </glossdef>
1456 </glossentry> 1459 </glossentry>