summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/bsp-guide/bsp.xml13
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml2
-rw-r--r--documentation/dev-manual/dev-manual-model.xml2
-rw-r--r--documentation/dev-manual/dev-manual-newbie.xml2
-rw-r--r--documentation/ref-manual/ref-variables.xml4
5 files changed, 12 insertions, 11 deletions
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index f681214aa5..ecdbabbd25 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -1248,20 +1248,21 @@
1248 Getting branches from remote repo git://git.yoctoproject.org/linux-yocto-3.10.git... 1248 Getting branches from remote repo git://git.yoctoproject.org/linux-yocto-3.10.git...
1249 Please choose a machine branch to base your new BSP branch on: [default: standard/base] 1249 Please choose a machine branch to base your new BSP branch on: [default: standard/base]
1250 1) standard/arm-versatile-926ejs 1250 1) standard/arm-versatile-926ejs
1251 2) standard/base 1251 2) standard/base
1252 3) standard/beagleboard 1252 3) standard/beaglebone
1253 4) standard/ck 1253 4) standard/ck
1254 5) standard/crownbay 1254 5) standard/crownbay
1255 6) standard/edf 1255 6) standard/edf
1256 7) standard/emenlow 1256 7) standard/emenlow
1257 8) standard/fri2 1257 8) standard/fri2
1258 9) standard/fsl-mpc8315e-rdb 1258 9) standard/fsl-mpc8315e-rdb
1259 10) standard/minnow 1259 10) standard/ltsi
1260 11) standard/mti-malta32 1260 11) standard/mti-malta32
1261 12) standard/mti-malta64 1261 12) standard/mti-malta64
1262 13) standard/qemuppc 1262 13) standard/ocf
1263 14) standard/routerstationpro 1263 14) standard/qemuppc
1264 15) standard/sys940x 1264 15) standard/edgerouter
1265 16) standard/sys940x
1265 1 1266 1
1266 Would you like SMP support? (y/n) [default: y] 1267 Would you like SMP support? (y/n) [default: y]
1267 Does your BSP have a touchscreen? (y/n) [default: n] 1268 Does your BSP have a touchscreen? (y/n) [default: n]
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 27e52839c0..528c9b71ea 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -5072,7 +5072,7 @@
5072 <literallayout class='monospaced'> 5072 <literallayout class='monospaced'>
5073 src/gz all http://www.mysite.com/BOARD-dir/all 5073 src/gz all http://www.mysite.com/BOARD-dir/all
5074 src/gz armv7a http://www.mysite.com/BOARD-dir/armv7a 5074 src/gz armv7a http://www.mysite.com/BOARD-dir/armv7a
5075 src/gz beagleboard http://www.mysite.com/BOARD-dir/beagleboard 5075 src/gz beaglebone http://www.mysite.com/BOARD-dir/beaglebone
5076 </literallayout> 5076 </literallayout>
5077 </para> 5077 </para>
5078 5078
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 6340527d05..be67f176fb 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -157,7 +157,7 @@
157 Yocto Project Board Support Package (BSP) Developer's Guide.</para> 157 Yocto Project Board Support Package (BSP) Developer's Guide.</para>
158 <note>Five BSPs exist that are part of the 158 <note>Five BSPs exist that are part of the
159 Yocto Project release: <filename>genericx86</filename>, <filename>genericx86-64</filename>, 159 Yocto Project release: <filename>genericx86</filename>, <filename>genericx86-64</filename>,
160 <filename>beagleboard</filename>, 160 <filename>beaglebone</filename>,
161 <filename>mpc8315e</filename>, and <filename>routerstationpro</filename>. 161 <filename>mpc8315e</filename>, and <filename>routerstationpro</filename>.
162 The recipes and configurations for these five BSPs are located and dispersed 162 The recipes and configurations for these five BSPs are located and dispersed
163 within the <link linkend='source-directory'>Source Directory</link>. 163 within the <link linkend='source-directory'>Source Directory</link>.
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index 6f58a5771d..37fa5afdd5 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -613,7 +613,7 @@
613 <link linkend='source-directory'>Source Directory</link>, define 613 <link linkend='source-directory'>Source Directory</link>, define
614 variables for specific hardware and are only used when building 614 variables for specific hardware and are only used when building
615 for that target (e.g. the 615 for that target (e.g. the
616 <filename>machine/beagleboard.conf</filename> configuration 616 <filename>machine/beaglebone.conf</filename> configuration
617 file defines variables for the Texas Instruments ARM Cortex-A8 617 file defines variables for the Texas Instruments ARM Cortex-A8
618 development board). 618 development board).
619 Configuration files end with a <filename>.conf</filename> 619 Configuration files end with a <filename>.conf</filename>
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 58b508e516..d553ba8f71 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -4301,9 +4301,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
4301 MACHINE ?= "qemux86-64" 4301 MACHINE ?= "qemux86-64"
4302 MACHINE ?= "genericx86" 4302 MACHINE ?= "genericx86"
4303 MACHINE ?= "genericx86-64" 4303 MACHINE ?= "genericx86-64"
4304 MACHINE ?= "beagleboard" 4304 MACHINE ?= "beaglebone"
4305 MACHINE ?= "mpc8315e-rdb" 4305 MACHINE ?= "mpc8315e-rdb"
4306 MACHINE ?= "routerstationpro" 4306 MACHINE ?= "edgerouter"
4307 </literallayout> 4307 </literallayout>
4308 The last five are Yocto Project reference hardware boards, which 4308 The last five are Yocto Project reference hardware boards, which
4309 are provided in the <filename>meta-yocto-bsp</filename> layer. 4309 are provided in the <filename>meta-yocto-bsp</filename> layer.