summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2016-03-17 09:01:19 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-23 21:56:08 +0000
commitb5d30657e7000fa04a9d60ac734db8f665aaa6ef (patch)
treec9f4d513c461149c9a41cfecf373198890cde303
parent884b5281c2b725aff426a4435f631554c93728aa (diff)
downloadpoky-b5d30657e7000fa04a9d60ac734db8f665aaa6ef.tar.gz
poky.ent, bsp-guide: Removed eMenlow example and updated 2.1 variables
Probably should have committed these separately but.... * Updated the BSP guide to use an example that we support. I removed the eMenlow stuff completely. * Fixed poky.ent so the 15.0.0 stuff is used for the variables. This supports the 2.1 release. (From yocto-docs rev: 598b261725235b6f160561db22bd9f31ec721066) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/bsp-guide/bsp-guide.xml4
-rw-r--r--documentation/bsp-guide/bsp.xml468
-rw-r--r--documentation/poky.ent4
3 files changed, 310 insertions, 166 deletions
diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml
index 5fae0e5e57..a8ea49a67f 100644
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -22,11 +22,11 @@
22 22
23 <authorgroup> 23 <authorgroup>
24 <author> 24 <author>
25 <firstname>Tom</firstname> <surname>Zanussi</surname> 25 <firstname>Saul</firstname> <surname>Wold</surname>
26 <affiliation> 26 <affiliation>
27 <orgname>Intel Corporation</orgname> 27 <orgname>Intel Corporation</orgname>
28 </affiliation> 28 </affiliation>
29 <email>tom.zanussi@intel.com</email> 29 <email>saul.wold@intel.com</email>
30 </author> 30 </author>
31 <author> 31 <author>
32 <firstname>Richard</firstname> <surname>Purdie</surname> 32 <firstname>Richard</firstname> <surname>Purdie</surname>
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index 8cf2a1e633..87c159cecf 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -60,16 +60,28 @@
60 <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi'></ulink>. 60 <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi'></ulink>.
61 If you go to that interface, you will find near the bottom of the list 61 If you go to that interface, you will find near the bottom of the list
62 under "Yocto Metadata Layers" several BSP layers all of which are 62 under "Yocto Metadata Layers" several BSP layers all of which are
63 supported by the Yocto Project (e.g. <filename>meta-minnow</filename>, 63 supported by the Yocto Project (e.g. <filename>meta-raspberrypi</filename> and
64 <filename>meta-raspberrypi</filename>, and
65 <filename>meta-intel</filename>). 64 <filename>meta-intel</filename>).
66 Each of these layers is a repository unto itself and clicking on a 65 Each of these layers is a repository unto itself and clicking on a
67 layer reveals information that includes two links from which you can choose 66 layer reveals information that includes two links from which you can choose
68 to set up a clone of the layer's repository on your local host system. 67 to set up a clone of the layer's repository on your local host system.
69 Here is an example that clones the MinnowBoard BSP layer: 68 Here is an example that clones the Raspberry Pi BSP layer:
70 <literallayout class='monospaced'> 69 <literallayout class='monospaced'>
71 $ git clone git://git.yoctoproject.org/meta-minnow 70 $ git clone git://git.yoctoproject.org/meta-raspberrypi
72 </literallayout> 71 </literallayout>
72 </para>
73
74 <para>
75 In addition to BSP layers near the bottom of that referenced
76 Yocto Project Source Repository, the
77 <filename>meta-yocto-bsp</filename> layer is part of the
78 shipped <filename>poky</filename> repository.
79 The <filename>meta-yocto-bsp</filename> layer maintains several
80 BSPs such as the Beaglebone, EdgeRouter, and generic versions of
81 both 32 and 64-bit IA machines.
82 </para>
83
84 <para>
73 For information on the BSP development workflow, see the 85 For information on the BSP development workflow, see the
74 "<ulink url='&YOCTO_DOCS_DEV_URL;#developing-a-board-support-package-bsp'>Developing a Board Support Package (BSP)</ulink>" 86 "<ulink url='&YOCTO_DOCS_DEV_URL;#developing-a-board-support-package-bsp'>Developing a Board Support Package (BSP)</ulink>"
75 section in the Yocto Project Development Manual. 87 section in the Yocto Project Development Manual.
@@ -80,8 +92,9 @@
80 </para> 92 </para>
81 93
82 <para> 94 <para>
83 The layer's base directory (<filename>meta-<replaceable>bsp_name</replaceable></filename>) is the root 95 The layer's base directory
84 of the BSP Layer. 96 (<filename>meta-<replaceable>bsp_name</replaceable></filename>)
97 is the root of the BSP Layer.
85 This root is what you add to the 98 This root is what you add to the
86 <ulink url='&YOCTO_DOCS_REF_URL;#var-BBLAYERS'><filename>BBLAYERS</filename></ulink> 99 <ulink url='&YOCTO_DOCS_REF_URL;#var-BBLAYERS'><filename>BBLAYERS</filename></ulink>
87 variable in the <filename>conf/bblayers.conf</filename> file found in the 100 variable in the <filename>conf/bblayers.conf</filename> file found in the
@@ -121,6 +134,8 @@
121 An example of this type of layer is the <filename>meta-intel</filename> layer, 134 An example of this type of layer is the <filename>meta-intel</filename> layer,
122 which contains a number of individual BSP sub-layers, as well as a directory 135 which contains a number of individual BSP sub-layers, as well as a directory
123 named <filename>common/</filename> full of common content across those layers. 136 named <filename>common/</filename> full of common content across those layers.
137 Another example is the <filename>meta-yocto-bsp</filename> layer mentioned
138 earlier.
124 </para> 139 </para>
125 140
126 <para> 141 <para>
@@ -130,7 +145,6 @@
130 </para> 145 </para>
131 </section> 146 </section>
132 147
133
134 <section id="bsp-filelayout"> 148 <section id="bsp-filelayout">
135 <title>Example Filesystem Layout</title> 149 <title>Example Filesystem Layout</title>
136 150
@@ -194,33 +208,142 @@
194 </para> 208 </para>
195 209
196 <para> 210 <para>
197 Below is an example of the eMenlow BSP: 211 Below is an example of the Raspberry Pi BSP:
198 212
199 <literallayout class='monospaced'> 213 <literallayout class='monospaced'>
200 meta-emenlow/COPYING.MIT 214 meta-raspberrypi/COPYING.MIT
201 meta-emenlow/README 215 meta-raspberrypi/README
202 meta-emenlow/README.sources 216 meta-raspberrypi/classes
203 meta-emenlow/binary/ 217 meta-raspberrypi/classes/linux-raspberrypi-base.bbclass
204 meta-emenlow/conf/ 218 meta-raspberrypi/classes/sdcard_image-rpi.bbclass
205 meta-emenlow/conf/layer.conf 219 meta-raspberrypi/conf/
206 meta-emenlow/conf/machine/ 220 meta-raspberrypi/conf/layer.conf
207 meta-emenlow/conf/machine/emenlow-noemgd.conf 221 meta-raspberrypi/conf/machine/
208 meta-emenlow/recipes-bsp/ 222 meta-raspberrypi/conf/machine/raspberrypi.conf
209 meta-emenlow/recipes-bsp/formfactor/ 223 meta-raspberrypi/conf/machine/raspberrypi0.conf
210 meta-emenlow/recipes-bsp/formfactor/formfactor/ 224 meta-raspberrypi/conf/machine/raspberrypi2.conf
211 meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend 225 meta-raspberrypi/conf/machine/raspberrypi3.conf
212 meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow-noemgd/ 226 meta-raspberrypi/conf/machine/include
213 meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow-noemgd/machconfig 227 meta-raspberrypi/conf/machine/include/rpi-base.inc
214 meta-emenlow/recipes-graphics/ 228 meta-raspberrypi/conf/machine/include/rpi-default-providers.inc
215 meta-emenlow/recipes-graphics/xorg-xserver 229 meta-raspberrypi/conf/machine/include/rpi-default-settings.inc
216 meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config 230 meta-raspberrypi/conf/machine/include/rpi-default-versions.inc
217 meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend 231 meta-raspberrypi/conf/machine/include/rpi-tune-arm1176jzf-s.inc
218 meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd 232 meta-raspberrypi/files
219 meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.config 233 meta-raspberrypi/files/custom-licenses
220 meta-emenlow/recipes-kernel/ 234 meta-raspberrypi/files/custom-licenses/Broadcom
221 meta-emenlow/recipes-kernel/linux/ 235 meta-raspberrypi/recipes-bsp
222 meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend 236 meta-raspberrypi/recipes-bsp/bootfiles
223 meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend 237 meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bb
238 meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb
239 meta-raspberrypi/recipes-bsp/common
240 meta-raspberrypi/recipes-bsp/common/firmware.inc
241 meta-raspberrypi/recipes-bsp/formfactor_00.bbappend
242 meta-raspberrypi/recipes-bsp/formfactor/raspberrypi/machconfig
243 meta-raspberrypi/recipes-bsp/rpi-mkimage_git.bb
244 meta-raspberrypi/recipes-bsp/rpi-mkimage/License
245 meta-raspberrypi/recipes-bsp/rpi-mkimage/open-files-relative-to-script.patch
246 meta-raspberrypi/recipes-bsp/u-boot/u-boot-rpi_git.bb
247 meta-raspberrypi/recipes-core
248 meta-raspberrypi/recipes-core/images
249 meta-raspberrypi/recipes-core/images/rpi-basic-image.bb
250 meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb
251 meta-raspberrypi/recipes-core/images/rpi-test-image.bb
252 meta-raspberrypi/recipes-core/packagegroups
253 meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb
254 meta-raspberrypi/recipes-core/psplash
255 meta-raspberrypi/recipes-core/psplash/files
256 meta-raspberrypi/recipes-core/psplash/psplash_git.bbappend
257 meta-raspberrypi/recipes-core/psplash/files/psplash-raspberrypi-img.h
258 meta-raspberrypi/recipes-devtools
259 meta-raspberrypi/recipes-devtools/bcm2835
260 meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.46.bb
261 meta-raspberrypi/recipes-devtools/pi-blaster
262 meta-raspberrypi/recipes-devtools/pi-blaster/files
263 meta-raspberrypi/recipes-devtools/pi-blaster/*.patch
264 meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster.inc
265 meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb
266 meta-raspberrypi/recipes-devtools/python
267 meta-raspberrypi/recipes-devtools/python/python-rtimu
268 meta-raspberrypi/recipes-devtools/python/python-rtimu/*.patch
269 meta-raspberrypi/recipes-devtools/python/python-rtimu_git.bb
270 meta-raspberrypi/recipes-devtools/python/python-sense-hat_2.1.0.bb
271 meta-raspberrypi/recipes-devtools/python/rpi-gpio
272 meta-raspberrypi/recipes-devtools/python/rpi-gpio/*.patch
273 meta-raspberrypi/recipes-devtools/python/rpi-gpio_0.6.1.bb
274 meta-raspberrypi/recipes-devtools/python/rpio
275 meta-raspberrypi/recipes-devtools/python/rpio/*.patch
276 meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb
277 meta-raspberrypi/recipes-devtools/wiringPi
278 meta-raspberrypi/recipes-devtools/wiringPi/files
279 meta-raspberrypi/recipes-devtools/wiringPi/files/*.patch
280 meta-raspberrypi/recipes-devtools/wiringPi/wiringpi
281 meta-raspberrypi/recipes-devtools/wiringPi/wiringpi/*.patch
282 meta-raspberrypi/recipes-devtools/wiringPi/wiringpi_git.bb
283 meta-raspberrypi/recipes-graphics
284 meta-raspberrypi/recipes-graphics/eglinfo
285 meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend
286 meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-x11_%.bbappend
287 meta-raspberrypi/recipes-graphics/userland
288 meta-raspberrypi/recipes-graphics/userland/userland
289 meta-raspberrypi/recipes-graphics/userland/userland/*.patch
290 meta-raspberrypi/recipes-graphics/userland/userland_git.bb
291 meta-raspberrypi/recipes-graphics/vc-graphics
292 meta-raspberrypi/recipes-graphics/vc-graphics/files
293 meta-raspberrypi/recipes-graphics/vc-graphics/files/egl.pc
294 meta-raspberrypi/recipes-graphics/vc-graphics/files/vchiq.sh
295 meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics-hardfp.bb
296 meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.bb
297 meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.inc
298 meta-raspberrypi/recipes-graphics/wayland
299 meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend
300 meta-raspberrypi/recipes-graphics/weston
301 meta-raspberrypi/recipes-graphics/weston/weston_%.bbappend
302 meta-raspberrypi/recipes-graphics/xorg-xserver
303 meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config
304 meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi
305 meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf
306 meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d
307 meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/10-evdev.conf
308 meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
309 meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
310 meta-raspberrypi/recipes-kernel
311 meta-raspberrypi/recipes-kernel/linux-firmware
312 meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware
313 meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware/LICENSE.broadcom_brcm80211
314 meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware/brcmfmac43430-sdio.bin
315 meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware/brcmfmac43430-sdio.txt
316 meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
317 meta-raspberrypi/recipes-kernel/linux
318 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-3.14
319 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-3.14/*.patch
320 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-3.18
321 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-3.18/*.patch
322 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.1
323 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.1/*.patch
324 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
325 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi
326 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi/defconfig
327 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_3.14.bb
328 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_3.18.bb
329 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.1.bb
330 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.4.bb
331 meta-raspberrypi/recipes-kernel/linux/linux.inc
332 meta-raspberrypi/recipes-multimedia
333 meta-raspberrypi/recipes-multimedia/gstreamer
334 meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx
335 meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx/*.patch
336 meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend
337 meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
338 meta-raspberrypi/recipes-multimedia/omxplayer
339 meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer
340 meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/*.patch
341 meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb
342 meta-raspberrypi/scripts
343 meta-raspberrypi/scripts/lib
344 meta-raspberrypi/scripts/lib/image
345 meta-raspberrypi/scripts/lib/image/canned-wks
346 meta-raspberrypi/scripts/lib/image/canned-wks/sdimage-raspberrypi.wks
224 </literallayout> 347 </literallayout>
225 </para> 348 </para>
226 349
@@ -241,7 +364,7 @@
241 <para> 364 <para>
242 These optional files satisfy licensing requirements for the BSP. 365 These optional files satisfy licensing requirements for the BSP.
243 The type or types of files here can vary depending on the licensing requirements. 366 The type or types of files here can vary depending on the licensing requirements.
244 For example, in the eMenlow BSP all licensing requirements are handled with the 367 For example, in the Raspberry Pi BSP all licensing requirements are handled with the
245 <filename>COPYING.MIT</filename> file. 368 <filename>COPYING.MIT</filename> file.
246 </para> 369 </para>
247 370
@@ -363,7 +486,7 @@
363 486
364 # We have a recipes directory, add to BBFILES 487 # We have a recipes directory, add to BBFILES
365 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ 488 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
366 ${LAYERDIR}/recipes-*/*/*.bbappend" 489 ${LAYERDIR}/recipes-*/*/*.bbappend"
367 490
368 BBFILE_COLLECTIONS += "<replaceable>bsp</replaceable>" 491 BBFILE_COLLECTIONS += "<replaceable>bsp</replaceable>"
369 BBFILE_PATTERN_<replaceable>bsp</replaceable> = "^${LAYERDIR}/" 492 BBFILE_PATTERN_<replaceable>bsp</replaceable> = "^${LAYERDIR}/"
@@ -375,20 +498,21 @@
375 498
376 <para> 499 <para>
377 To illustrate the string substitutions, here are the corresponding statements 500 To illustrate the string substitutions, here are the corresponding statements
378 from the eEmenlow <filename>conf/layer.conf</filename> file: 501 from the Raspberry Pi <filename>conf/layer.conf</filename> file:
379 <literallayout class='monospaced'> 502 <literallayout class='monospaced'>
380 # We have a conf and classes directory, add to BBPATH 503 # We have a conf and classes directory, append to BBPATH
381 BBPATH .= ":${LAYERDIR}" 504 BBPATH .= ":${LAYERDIR}"
382 505
383 # We have recipes-* directories, add to BBFILES 506 # We have a recipes directory containing .bb and .bbappend files, add to BBFILES
384 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ 507 BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
385 ${LAYERDIR}/recipes-*/*/*.bbappend" 508 ${LAYERDIR}/recipes*/*/*.bbappend"
386 509
387 BBFILE_COLLECTIONS += "emenlow" 510 BBFILE_COLLECTIONS += "raspberrypi"
388 BBFILE_PATTERN_emenlow := "^${LAYERDIR}/" 511 BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/"
389 BBFILE_PRIORITY_emenlow = "6" 512 BBFILE_PRIORITY_raspberrypi = "9"
390 513
391 LAYERDEPENDS_emenlow = "intel" 514 # Additional license directories.
515 LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
392 </literallayout> 516 </literallayout>
393 </para> 517 </para>
394 518
@@ -450,13 +574,11 @@
450 <para> 574 <para>
451 To use an include file, you simply include them in the 575 To use an include file, you simply include them in the
452 machine configuration file. 576 machine configuration file.
453 For example, the eEmenlow BSP 577 For example, the Raspberry Pi BSP
454 <filename>emenlow-noemgd.conf</filename> contains the 578 <filename>raspberrypi3.conf</filename> contains the
455 following statements: 579 following statement:
456 <literallayout class='monospaced'> 580 <literallayout class='monospaced'>
457 require conf/machine/include/intel-core2-32-common.inc 581 include conf/machine/raspberrypi2.conf
458 require conf/machine/include/intel-common-pkgarch.inc
459 require conf/machine/include/meta-intel.inc
460 </literallayout> 582 </literallayout>
461 </para> 583 </para>
462 </section> 584 </section>
@@ -474,20 +596,22 @@
474 This optional directory contains miscellaneous recipe files for 596 This optional directory contains miscellaneous recipe files for
475 the BSP. 597 the BSP.
476 Most notably would be the formfactor files. 598 Most notably would be the formfactor files.
477 For example, in the eMenlow BSP there is the 599 For example, in the Raspberry Pi BSP there is the
478 <filename>formfactor_0.0.bbappend</filename> file, which is an 600 <filename>formfactor_0.0.bbappend</filename> file, which is an
479 append file used to augment the recipe that starts the build. 601 append file used to augment the recipe that starts the build.
480 Furthermore, there are machine-specific settings used during 602 Furthermore, there are machine-specific settings used during
481 the build that are defined by the 603 the build that are defined by the
482 <filename>machconfig</filename> file further down in the 604 <filename>machconfig</filename> file further down in the
483 directory. 605 directory.
484 In the eMenlow example, the <filename>machconfig</filename> 606 Here is the <filename>machconfig</filename>
485 file supports the Video Electronics Standards Association 607 file for the Raspberry Pi BSP:
486 (VESA) graphics driver:
487 <literallayout class='monospaced'> 608 <literallayout class='monospaced'>
488 # Assume a USB mouse and keyboard are connected
489 HAVE_TOUCHSCREEN=0 609 HAVE_TOUCHSCREEN=0
490 HAVE_KEYBOARD=1 610 HAVE_KEYBOARD=1
611
612 DISPLAY_CAN_ROTATE=0
613 DISPLAY_ORIENTATION=0
614 DISPLAY_DPI=133
491 </literallayout> 615 </literallayout>
492 </para> 616 </para>
493 617
@@ -515,18 +639,6 @@
515 special requirements for graphics support. 639 special requirements for graphics support.
516 All files that are needed for the BSP to support a display are 640 All files that are needed for the BSP to support a display are
517 kept here. 641 kept here.
518 For example, the <filename>meta-emenlow</filename> layer,
519 which supports the eMenlow platform consisting of the
520 <trademark class='registered'>Intel</trademark>
521 <trademark class='trade'>Atom</trademark>
522 Z5xx processor with the
523 <trademark class='registered'>Intel</trademark>
524 System Controller Hub US15W, uses these files for supporting
525 the Video Electronics Standards Association (VESA) graphics:
526 <literallayout class='monospaced'>
527 meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
528 meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf
529 </literallayout>
530 </para> 642 </para>
531 </section> 643 </section>
532 644
@@ -551,47 +663,63 @@
551 the <filename>meta-<replaceable>bsp_name</replaceable>/recipes-kernel/linux</filename> directory). 663 the <filename>meta-<replaceable>bsp_name</replaceable>/recipes-kernel/linux</filename> directory).
552 </para> 664 </para>
553 <para> 665 <para>
554 Suppose you are using the <filename>linux-yocto_3.14.bb</filename> recipe to build 666 Suppose you are using the <filename>linux-yocto_4.4.bb</filename> recipe to build
555 the kernel. 667 the kernel.
556 In other words, you have selected the kernel in your 668 In other words, you have selected the kernel in your
557 <replaceable>bsp_name</replaceable><filename>.conf</filename> file by adding these types 669 <replaceable>bsp_name</replaceable><filename>.conf</filename> file by adding these types
558 of statements: 670 of statements:
559 <literallayout class='monospaced'> 671 <literallayout class='monospaced'>
560 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 672 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
561 PREFERRED_VERSION_linux-yocto ?= "3.14%" 673 PREFERRED_VERSION_linux-yocto ?= "4.4%"
562 </literallayout> 674 </literallayout>
563 <note> 675 <note>
564 When the preferred provider is assumed by default, the 676 When the preferred provider is assumed by default, the
565 <filename>PREFERRED_PROVIDER</filename> statement does not appear in the 677 <filename>PREFERRED_PROVIDER</filename> statement does not appear in the
566 <replaceable>bsp_name</replaceable><filename>.conf</filename> file. 678 <replaceable>bsp_name</replaceable><filename>.conf</filename> file.
567 </note> 679 </note>
568 You would use the <filename>linux-yocto_3.14.bbappend</filename> file to append 680 You would use the <filename>linux-yocto_4.4.bbappend</filename>
569 specific BSP settings to the kernel, thus configuring the kernel for your particular BSP. 681 file to append specific BSP settings to the kernel, thus
682 configuring the kernel for your particular BSP.
570 </para> 683 </para>
684
571 <para> 685 <para>
572 As an example, look at the existing eMenlow BSP. 686 As an example, consider the following append file
573 The append file used is: 687 used by the BSPs in <filename>meta-yocto-bsp</filename>:
574 <literallayout class='monospaced'> 688 <literallayout class='monospaced'>
575 meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend 689 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend
576 </literallayout> 690 </literallayout>
577 The following listing shows the file. 691 The following listing shows the file.
578 Be aware that the actual commit ID strings in this example listing might be different 692 Be aware that the actual commit ID strings in this
579 than the actual strings in the file from the <filename>meta-intel</filename> 693 example listing might be different than the actual strings
580 Git source repository. 694 in the file from the <filename>meta-yocto-bsp</filename>
695 layer upstream.
581 <literallayout class='monospaced'> 696 <literallayout class='monospaced'>
582 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 697 KBRANCH_genericx86 = "standard/base"
583 698 KBRANCH_genericx86-64 = "standard/base"
584 COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" 699
585 KMACHINE_emenlow-noemgd = "emenlow" 700 KMACHINE_genericx86 ?= "common-pc"
586 KBRANCH_emenlow-noemgd = "standard/base" 701 KMACHINE_genericx86-64 ?= "common-pc-64"
587 KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500.scc" 702 KBRANCH_edgerouter = "standard/edgerouter"
588 703 KBRANCH_beaglebone = "standard/beaglebone"
589 LINUX_VERSION_emenlow-noemgd = "3.14.19" 704 KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
590 SRCREV_machine_emenlow-noemgd = "902f34d36102a4b2008b776ecae686f80d307e12" 705
591 SRCREV_meta_emenlow-noemgd = "28e39741b8b3018334021d981369d3fd61f18f5b" 706 SRCREV_machine_genericx86 ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2"
707 SRCREV_machine_genericx86-64 ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2"
708 SRCREV_machine_edgerouter ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2"
709 SRCREV_machine_beaglebone ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2"
710 SRCREV_machine_mpc8315e-rdb ?= "df00877ef9387b38b9601c82db57de2a1b23ce53"
711
712 COMPATIBLE_MACHINE_genericx86 = "genericx86"
713 COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
714 COMPATIBLE_MACHINE_edgerouter = "edgerouter"
715 COMPATIBLE_MACHINE_beaglebone = "beaglebone"
716 COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
717
718 LINUX_VERSION_genericx86 = "4.4.3"
719 LINUX_VERSION_genericx86-64 = "4.4.3"
592 </literallayout> 720 </literallayout>
593 This append file contains statements used to support the 721 This append file contains statements used to support
594 eMenlow BSP. 722 several BSPs that ship with the Yocto Project.
595 The file defines machines using the 723 The file defines machines using the
596 <ulink url='&YOCTO_DOCS_REF_URL;#var-COMPATIBLE_MACHINE'><filename>COMPATIBLE_MACHINE</filename></ulink> 724 <ulink url='&YOCTO_DOCS_REF_URL;#var-COMPATIBLE_MACHINE'><filename>COMPATIBLE_MACHINE</filename></ulink>
597 variable and uses the 725 variable and uses the
@@ -602,25 +730,31 @@
602 The file also uses the optional 730 The file also uses the optional
603 <ulink url='&YOCTO_DOCS_REF_URL;#var-KBRANCH'><filename>KBRANCH</filename></ulink> 731 <ulink url='&YOCTO_DOCS_REF_URL;#var-KBRANCH'><filename>KBRANCH</filename></ulink>
604 variable to ensure the build process uses the 732 variable to ensure the build process uses the
605 <filename>standard/emenlow</filename> kernel branch. 733 appropriate kernel branch.
606 The 734 </para>
735
736 <para>
737 Although this particular example does not use it, the
607 <ulink url='&YOCTO_DOCS_REF_URL;#var-KERNEL_FEATURES'><filename>KERNEL_FEATURES</filename></ulink> 738 <ulink url='&YOCTO_DOCS_REF_URL;#var-KERNEL_FEATURES'><filename>KERNEL_FEATURES</filename></ulink>
608 variable enables features specific to the kernel 739 variable could be used to enable features specific to
609 (e.g. Intel GMA-500 DRM Driver in this case). 740 the kernel.
610 The append file points to specific commits in the 741 The append file points to specific commits in the
611 <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink> 742 <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>
612 Git repository and the <filename>meta</filename> Git repository 743 Git repository and the <filename>meta</filename> Git repository
613 branches to identify the exact kernel needed to build the 744 branches to identify the exact kernel needed to build the
614 eMenlow BSP. 745 BSP.
615 </para> 746 </para>
616 747
617 <para> 748 <para>
618 One thing missing in this particular BSP, which you will typically need when 749 One thing missing in this particular BSP, which you will
619 developing a BSP, is the kernel configuration file (<filename>.config</filename>) for your BSP. 750 typically need when developing a BSP, is the kernel configuration
620 When developing a BSP, you probably have a kernel configuration file or a set of kernel 751 file (<filename>.config</filename>) for your BSP.
621 configuration files that, when taken together, define the kernel configuration for your BSP. 752 When developing a BSP, you probably have a kernel configuration
622 You can accomplish this definition by putting the configurations in a file or a set of files 753 file or a set of kernel configuration files that, when taken
623 inside a directory located at the same level as your kernel's append file and having the same 754 together, define the kernel configuration for your BSP.
755 You can accomplish this definition by putting the configurations
756 in a file or a set of files inside a directory located at the
757 same level as your kernel's append file and having the same
624 name as the kernel's main recipe file. 758 name as the kernel's main recipe file.
625 With all these conditions met, simply reference those files in the 759 With all these conditions met, simply reference those files in the
626 <ulink url='&YOCTO_DOCS_REF_URL;#var-SRC_URI'><filename>SRC_URI</filename></ulink> 760 <ulink url='&YOCTO_DOCS_REF_URL;#var-SRC_URI'><filename>SRC_URI</filename></ulink>
@@ -628,37 +762,42 @@
628 </para> 762 </para>
629 763
630 <para> 764 <para>
631 For example, suppose you had some configuration options in a file called 765 For example, suppose you had some configuration options
632 <filename>network_configs.cfg</filename>. 766 in a file called <filename>network_configs.cfg</filename>.
633 You can place that file inside a directory named <filename>linux-yocto</filename> and then add 767 You can place that file inside a directory named
634 a <filename>SRC_URI</filename> statement such as the following to the append file. 768 <filename>linux-yocto</filename> and then add
635 When the OpenEmbedded build system builds the kernel, the configuration options are 769 a <filename>SRC_URI</filename> statement such as the
636 picked up and applied. 770 following to the append file.
771 When the OpenEmbedded build system builds the kernel, the
772 configuration options are picked up and applied.
637 <literallayout class='monospaced'> 773 <literallayout class='monospaced'>
638 SRC_URI += "file://network_configs.cfg" 774 SRC_URI += "file://network_configs.cfg"
639 </literallayout> 775 </literallayout>
640 </para> 776 </para>
641 777
642 <para> 778 <para>
643 To group related configurations into multiple files, you perform a similar procedure. 779 To group related configurations into multiple files, you
644 Here is an example that groups separate configurations specifically for Ethernet and graphics 780 perform a similar procedure.
645 into their own files and adds the configurations 781 Here is an example that groups separate configurations
646 by using a <filename>SRC_URI</filename> statement like the following in your append file: 782 specifically for Ethernet and graphics into their own
783 files and adds the configurations by using a
784 <filename>SRC_URI</filename> statement like the following
785 in your append file:
647 <literallayout class='monospaced'> 786 <literallayout class='monospaced'>
648 SRC_URI += "file://myconfig.cfg \ 787 SRC_URI += "file://myconfig.cfg \
649 file://eth.cfg \ 788 file://eth.cfg \
650 file://gfx.cfg" 789 file://gfx.cfg"
651 </literallayout> 790 </literallayout>
652 </para> 791 </para>
653 792
654 <para> 793 <para>
655 The <ulink url='&YOCTO_DOCS_REF_URL;#var-FILESEXTRAPATHS'><filename>FILESEXTRAPATHS</filename></ulink> 794 Another variable you can use in your kernel recipe append
656 variable is in boilerplate form in the 795 file is the
657 previous example in order to make it easy to do that. 796 <ulink url='&YOCTO_DOCS_REF_URL;#var-FILESEXTRAPATHS'><filename>FILESEXTRAPATHS</filename></ulink>
658 This variable must be in your layer or BitBake will not find the patches or 797 variable.
659 configurations even if you have them in your <filename>SRC_URI</filename>. 798 When you use this statement, you are extending the locations
660 The <filename>FILESEXTRAPATHS</filename> variable enables the build process to 799 used by the OpenEmbedded system to look for files and
661 find those configuration files. 800 patches as the recipe is processed.
662 </para> 801 </para>
663 802
664 <note> 803 <note>
@@ -711,7 +850,7 @@
711 "<ulink url='&YOCTO_DOCS_DEV_URL;#understanding-and-creating-layers'>Understanding 850 "<ulink url='&YOCTO_DOCS_DEV_URL;#understanding-and-creating-layers'>Understanding
712 and Creating Layers"</ulink> in the Yocto Project Development Manual.</para></listitem> 851 and Creating Layers"</ulink> in the Yocto Project Development Manual.</para></listitem>
713 <listitem><para>The requirements in this section apply regardless of how you 852 <listitem><para>The requirements in this section apply regardless of how you
714 ultimately package a BSP. 853 package a BSP.
715 You should consult the packaging and distribution guidelines for your 854 You should consult the packaging and distribution guidelines for your
716 specific release process. 855 specific release process.
717 For an example of packaging and distribution requirements, see the 856 For an example of packaging and distribution requirements, see the
@@ -731,7 +870,7 @@
731 </para> 870 </para>
732 871
733 <para> 872 <para>
734 Following are the requirements for a released BSP that conforms to the 873 Following are the requirements for a released BSP that conform to the
735 Yocto Project: 874 Yocto Project:
736 <itemizedlist> 875 <itemizedlist>
737 <listitem><para><emphasis>Layer Name:</emphasis> 876 <listitem><para><emphasis>Layer Name:</emphasis>
@@ -777,15 +916,16 @@
777 You must specify which license to use since there is no 916 You must specify which license to use since there is no
778 default license if one is not specified. 917 default license if one is not specified.
779 See the 918 See the
780 <ulink url='&YOCTO_GIT_URL;/cgit.cgi/meta-intel/tree/meta-fri2/COPYING.MIT'><filename>COPYING.MIT</filename></ulink> 919 <ulink url='&YOCTO_GIT_URL;/cgit.cgi/meta-raspberrypi/tree/COPYING.MIT'><filename>COPYING.MIT</filename></ulink>
781 file for the Fish River Island 2 BSP in the <filename>meta-fri2</filename> BSP layer 920 file for the Raspberry Pi BSP in the
782 as an example.</para></listitem> 921 <filename>meta-raspberrypi</filename> BSP layer as an example.
922 </para></listitem>
783 <listitem><para><emphasis>README File:</emphasis> 923 <listitem><para><emphasis>README File:</emphasis>
784 You must include a <filename>README</filename> file in the 924 You must include a <filename>README</filename> file in the
785 <filename>meta-<replaceable>bsp_name</replaceable></filename> directory. 925 <filename>meta-<replaceable>bsp_name</replaceable></filename> directory.
786 See the 926 See the
787 <ulink url='&YOCTO_GIT_URL;/cgit.cgi/meta-intel/tree/meta-fri2/README'><filename>README</filename></ulink> 927 <ulink url='&YOCTO_GIT_URL;/cgit.cgi/meta-raspberrypi/tree/README'><filename>README</filename></ulink>
788 file for the Fish River Island 2 BSP in the <filename>meta-fri2</filename> BSP layer 928 file for the Raspberry Pi BSP in the <filename>meta-raspberrypi</filename> BSP layer
789 as an example.</para> 929 as an example.</para>
790 <para>At a minimum, the <filename>README</filename> file should 930 <para>At a minimum, the <filename>README</filename> file should
791 contain the following: 931 contain the following:
@@ -828,10 +968,7 @@
828 This file specifies exactly where you can find the sources used to 968 This file specifies exactly where you can find the sources used to
829 generate the binary images contained in the 969 generate the binary images contained in the
830 <filename>binary</filename> directory, if present. 970 <filename>binary</filename> directory, if present.
831 See the 971 </para></listitem>
832 <ulink url='&YOCTO_GIT_URL;/cgit.cgi/meta-intel/tree/meta-fri2/README.sources'><filename>README.sources</filename></ulink>
833 file for the Fish River Island 2 BSP in the <filename>meta-fri2</filename> BSP layer
834 as an example.</para></listitem>
835 <listitem><para><emphasis>Layer Configuration File:</emphasis> 972 <listitem><para><emphasis>Layer Configuration File:</emphasis>
836 You must include a <filename>conf/layer.conf</filename> in the 973 You must include a <filename>conf/layer.conf</filename> in the
837 <filename>meta-<replaceable>bsp_name</replaceable></filename> directory. 974 <filename>meta-<replaceable>bsp_name</replaceable></filename> directory.
@@ -1175,13 +1312,14 @@
1175 for that sub-command: 1312 for that sub-command:
1176 <literallayout class='monospaced'> 1313 <literallayout class='monospaced'>
1177 $ yocto-bsp create 1314 $ yocto-bsp create
1315 ERROR:root:Wrong number of arguments, exiting
1178 1316
1179 Usage: 1317 Usage:
1180 1318
1181 Create a new Yocto BSP 1319 Create a new Yocto BSP
1182 1320
1183 usage: yocto-bsp create &lt;bsp-name&gt; &lt;karch&gt; [-o &lt;DIRNAME&gt; | --outdir &lt;DIRNAME&gt;] 1321 usage: yocto-bsp create &lt;bsp-name&gt; &lt;karch&gt; [-o &lt;DIRNAME&gt; | --outdir &lt;DIRNAME&gt;]
1184 [-i &lt;JSON PROPERTY FILE&gt; | --infile &lt;JSON PROPERTY_FILE&gt;] 1322 [-i &lt;JSON PROPERTY FILE&gt; | --infile &lt;JSON PROPERTY_FILE&gt;]
1185 1323
1186 This command creates a Yocto BSP based on the specified parameters. 1324 This command creates a Yocto BSP based on the specified parameters.
1187 The new BSP will be a new Yocto BSP layer contained by default within 1325 The new BSP will be a new Yocto BSP layer contained by default within
@@ -1189,6 +1327,12 @@
1189 can be used to place the BSP layer in a directory with a different 1327 can be used to place the BSP layer in a directory with a different
1190 name and location. 1328 name and location.
1191 1329
1330 The value of the 'karch' parameter determines the set of files that
1331 will be generated for the BSP, along with the specific set of
1332 'properties' that will be used to fill out the BSP-specific portions
1333 of the BSP. The possible values for the 'karch' parameter can be
1334 listed via 'yocto-bsp list karch'.
1335
1192 ... 1336 ...
1193 </literallayout> 1337 </literallayout>
1194 </para> 1338 </para>
@@ -1203,7 +1347,7 @@
1203 yocto-bsp create - Create a new Yocto BSP 1347 yocto-bsp create - Create a new Yocto BSP
1204 1348
1205 SYNOPSIS 1349 SYNOPSIS
1206 yocto-bsp create &lt;bsp-name&gt; &lt;karch&gt; [-o &lt;DIRNAME&gt; | --outdir &lt;DIRNAME&gt;] 1350 yocto-bsp create &lt;bsp-name> &lt;karch&gt; [-o &lt;DIRNAME&gt; | --outdir &lt;DIRNAME&gt;]
1207 [-i &lt;JSON PROPERTY FILE&gt; | --infile &lt;JSON PROPERTY_FILE&gt;] 1351 [-i &lt;JSON PROPERTY FILE&gt; | --infile &lt;JSON PROPERTY_FILE&gt;]
1208 1352
1209 DESCRIPTION 1353 DESCRIPTION
@@ -1213,12 +1357,6 @@
1213 'meta-bsp-name'. The -o option can be used to place the BSP layer 1357 'meta-bsp-name'. The -o option can be used to place the BSP layer
1214 in a directory with a different name and location. 1358 in a directory with a different name and location.
1215 1359
1216 The value of the 'karch' parameter determines the set of files
1217 that will be generated for the BSP, along with the specific set of
1218 'properties' that will be used to fill out the BSP-specific
1219 portions of the BSP. The possible values for the 'karch' parameter
1220 can be listed via 'yocto-bsp list karch'.
1221
1222 ... 1360 ...
1223 </literallayout> 1361 </literallayout>
1224 </para> 1362 </para>
@@ -1280,13 +1418,13 @@
1280 <literallayout class='monospaced'> 1418 <literallayout class='monospaced'>
1281 $ yocto-bsp list karch 1419 $ yocto-bsp list karch
1282 Architectures available: 1420 Architectures available:
1283 qemu
1284 mips64
1285 powerpc 1421 powerpc
1286 x86_64 1422 x86_64
1423 i386
1287 arm 1424 arm
1425 qemu
1288 mips 1426 mips
1289 i386 1427 mips64
1290 </literallayout> 1428 </literallayout>
1291 </para> 1429 </para>
1292 1430
@@ -1320,35 +1458,34 @@
1320 $ yocto-bsp create myarm qemu 1458 $ yocto-bsp create myarm qemu
1321 Checking basic git connectivity... 1459 Checking basic git connectivity...
1322 Done. 1460 Done.
1461
1323 Which qemu architecture would you like to use? [default: i386] 1462 Which qemu architecture would you like to use? [default: i386]
1324 1) i386 (32-bit) 1463 1) i386 (32-bit)
1325 2) x86_64 (64-bit) 1464 2) x86_64 (64-bit)
1326 3) ARM (32-bit) 1465 3) ARM (32-bit)
1327 4) PowerPC (32-bit) 1466 4) PowerPC (32-bit)
1328 5) MIPS (32-bit) 1467 5) MIPS (32-bit)
1329 6) MIPS64 (64-bit) 1468 6) MIPS64 (64-bit)
1330 3 1469 3
1331 Would you like to use the default (3.19) kernel? (y/n) [default: y] y 1470 Would you like to use the default (4.4) kernel? (y/n) [default: y]
1332 Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n] [default: y] 1471 Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n] [default: y]
1333 Getting branches from remote repo git://git.yoctoproject.org/linux-yocto-3.19.git... 1472 Getting branches from remote repo git://git.yoctoproject.org/linux-yocto-4.4.git...
1334 Please choose a machine branch to base your new BSP branch on: [default: standard/base] 1473 Please choose a machine branch to base your new BSP branch on: [default: standard/base]
1335 1) standard/arm-versatile-926ejs 1474 1) standard/arm-versatile-926ejs
1336 2) standard/base 1475 2) standard/base
1337 3) standard/beagleboard 1476 3) standard/beaglebone
1338 4) standard/beaglebone 1477 4) standard/edgerouter
1339 5) standard/ck 1478 5) standard/fsl-mpc8315e-rdb
1340 6) standard/common-pc 1479 6) standard/mti-malta32
1341 7) standard/crownbay 1480 7) standard/mti-malta64
1342 8) standard/edgerouter 1481 8) standard/preempt-rt
1343 9) standard/fsl-mpc8315e-rdb 1482 9) standard/qemuarm64
1344 10) standard/mti-malta32 1483 10) standard/qemuppc
1345 11) standard/mti-malta64
1346 12) standard/qemuarm64
1347 13) standard/qemuppc
1348 1 1484 1
1349 Would you like SMP support? (y/n) [default: y] 1485 Would you like SMP support? (y/n) [default: y]
1350 Does your BSP have a touchscreen? (y/n) [default: n] 1486 Does your BSP have a touchscreen? (y/n) [default: n]
1351 Does your BSP have a keyboard? (y/n) [default: y] 1487 Does your BSP have a keyboard? (y/n) [default: y]
1488
1352 New qemu BSP created in meta-myarm 1489 New qemu BSP created in meta-myarm
1353 </literallayout> 1490 </literallayout>
1354 Take a closer look at the example now: 1491 Take a closer look at the example now:
@@ -1358,7 +1495,7 @@
1358 In the example, we use the ARM architecture. 1495 In the example, we use the ARM architecture.
1359 </para></listitem> 1496 </para></listitem>
1360 <listitem><para>The script then prompts you for the kernel. 1497 <listitem><para>The script then prompts you for the kernel.
1361 The default 3.19 kernel is acceptable. 1498 The default 4.4 kernel is acceptable.
1362 So, the example accepts the default. 1499 So, the example accepts the default.
1363 If you enter 'n', the script prompts you to further enter the kernel 1500 If you enter 'n', the script prompts you to further enter the kernel
1364 you do want to use.</para></listitem> 1501 you do want to use.</para></listitem>
@@ -1433,8 +1570,11 @@
1433 <literallayout class='monospaced'> 1570 <literallayout class='monospaced'>
1434 $ yocto-kernel --help 1571 $ yocto-kernel --help
1435 Usage: 1572 Usage:
1573
1436 Modify and list Yocto BSP kernel config items and patches. 1574 Modify and list Yocto BSP kernel config items and patches.
1575
1437 usage: yocto-kernel [--version] [--help] COMMAND [ARGS] 1576 usage: yocto-kernel [--version] [--help] COMMAND [ARGS]
1577
1438 Current 'yocto-kernel' commands are: 1578 Current 'yocto-kernel' commands are:
1439 config list List the modifiable set of bare kernel config options for a BSP 1579 config list List the modifiable set of bare kernel config options for a BSP
1440 config add Add or modify bare kernel config options for a BSP 1580 config add Add or modify bare kernel config options for a BSP
@@ -1449,7 +1589,11 @@
1449 feature describe Describe a particular feature 1589 feature describe Describe a particular feature
1450 feature create Create a new BSP-local feature 1590 feature create Create a new BSP-local feature
1451 feature destroy Remove a BSP-local feature 1591 feature destroy Remove a BSP-local feature
1592
1452 See 'yocto-kernel help COMMAND' for more information on a specific command. 1593 See 'yocto-kernel help COMMAND' for more information on a specific command.
1594
1595
1596
1453 Options: 1597 Options:
1454 --version show program's version number and exit 1598 --version show program's version number and exit
1455 -h, --help show this help message and exit 1599 -h, --help show this help message and exit
diff --git a/documentation/poky.ent b/documentation/poky.ent
index b045ce64db..5a787ec342 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -2,8 +2,8 @@
2<!ENTITY DISTRO_COMPRESSED "21"> 2<!ENTITY DISTRO_COMPRESSED "21">
3<!ENTITY DISTRO_NAME "tbd"> 3<!ENTITY DISTRO_NAME "tbd">
4<!ENTITY YOCTO_DOC_VERSION "2.1"> 4<!ENTITY YOCTO_DOC_VERSION "2.1">
5<!ENTITY POKYVERSION "15.0.1"> 5<!ENTITY POKYVERSION "15.0.0">
6<!ENTITY POKYVERSION_COMPRESSED "1501"> 6<!ENTITY POKYVERSION_COMPRESSED "1500">
7<!ENTITY YOCTO_POKY "poky-&DISTRO_NAME;-&POKYVERSION;"> 7<!ENTITY YOCTO_POKY "poky-&DISTRO_NAME;-&POKYVERSION;">
8<!ENTITY COPYRIGHT_YEAR "2010-2016"> 8<!ENTITY COPYRIGHT_YEAR "2010-2016">
9<!ENTITY YOCTO_DL_URL "http://downloads.yoctoproject.org"> 9<!ENTITY YOCTO_DL_URL "http://downloads.yoctoproject.org">