summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/bsp-guide/bsp.xml26
1 files changed, 12 insertions, 14 deletions
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index 3d4e82ea83..abab3f4195 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -225,8 +225,6 @@
225 meta-emenlow/recipes-kernel/ 225 meta-emenlow/recipes-kernel/
226 meta-emenlow/recipes-kernel/linux/ 226 meta-emenlow/recipes-kernel/linux/
227 meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend 227 meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
228 meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
229 meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
230 meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend 228 meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend
231 </literallayout> 229 </literallayout>
232 </para> 230 </para>
@@ -558,28 +556,28 @@
558 the <filename>meta-<replaceable>bsp_name</replaceable>/recipes-kernel/linux</filename> directory). 556 the <filename>meta-<replaceable>bsp_name</replaceable>/recipes-kernel/linux</filename> directory).
559 </para> 557 </para>
560 <para> 558 <para>
561 Suppose you are using the <filename>linux-yocto_3.10.bb</filename> recipe to build 559 Suppose you are using the <filename>linux-yocto_3.14.bb</filename> recipe to build
562 the kernel. 560 the kernel.
563 In other words, you have selected the kernel in your 561 In other words, you have selected the kernel in your
564 <replaceable>bsp_name</replaceable><filename>.conf</filename> file by adding these types 562 <replaceable>bsp_name</replaceable><filename>.conf</filename> file by adding these types
565 of statements: 563 of statements:
566 <literallayout class='monospaced'> 564 <literallayout class='monospaced'>
567 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 565 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
568 PREFERRED_VERSION_linux-yocto ?= "3.10%" 566 PREFERRED_VERSION_linux-yocto ?= "3.14%"
569 </literallayout> 567 </literallayout>
570 <note> 568 <note>
571 When the preferred provider is assumed by default, the 569 When the preferred provider is assumed by default, the
572 <filename>PREFERRED_PROVIDER</filename> statement does not appear in the 570 <filename>PREFERRED_PROVIDER</filename> statement does not appear in the
573 <replaceable>bsp_name</replaceable><filename>.conf</filename> file. 571 <replaceable>bsp_name</replaceable><filename>.conf</filename> file.
574 </note> 572 </note>
575 You would use the <filename>linux-yocto_3.10.bbappend</filename> file to append 573 You would use the <filename>linux-yocto_3.14.bbappend</filename> file to append
576 specific BSP settings to the kernel, thus configuring the kernel for your particular BSP. 574 specific BSP settings to the kernel, thus configuring the kernel for your particular BSP.
577 </para> 575 </para>
578 <para> 576 <para>
579 As an example, look at the existing eMenlow BSP. 577 As an example, look at the existing eMenlow BSP.
580 The append file used is: 578 The append file used is:
581 <literallayout class='monospaced'> 579 <literallayout class='monospaced'>
582 meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend 580 meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend
583 </literallayout> 581 </literallayout>
584 The following listing shows the file. 582 The following listing shows the file.
585 Be aware that the actual commit ID strings in this example listing might be different 583 Be aware that the actual commit ID strings in this example listing might be different
@@ -590,12 +588,12 @@
590 588
591 COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" 589 COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
592 KMACHINE_emenlow-noemgd = "emenlow" 590 KMACHINE_emenlow-noemgd = "emenlow"
593 KBRANCH_emenlow-noemgd = "standard/emenlow" 591 KBRANCH_emenlow-noemgd = "standard/base"
594 KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" 592 KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
595 593
596 LINUX_VERSION_emenlow-noemgd = "3.10.55" 594 LINUX_VERSION_emenlow-noemgd = "3.14.19"
597 SRCREV_meta_emenlow-noemgd = "f79a00265eefbe2fffc2cdb03f67235497a9a87e" 595 SRCREV_machine_emenlow-noemgd = "902f34d36102a4b2008b776ecae686f80d307e12"
598 SRCREV_machine_emenlow-noemgd = "3677ea7f9476458aa6dec440243de3a6fb1343a9" 596 SRCREV_meta_emenlow-noemgd = "28e39741b8b3018334021d981369d3fd61f18f5b"
599 </literallayout> 597 </literallayout>
600 This append file contains statements used to support the 598 This append file contains statements used to support the
601 eMenlow BSP. 599 eMenlow BSP.
@@ -613,7 +611,7 @@
613 The 611 The
614 <ulink url='&YOCTO_DOCS_REF_URL;#var-KERNEL_FEATURES'><filename>KERNEL_FEATURES</filename></ulink> 612 <ulink url='&YOCTO_DOCS_REF_URL;#var-KERNEL_FEATURES'><filename>KERNEL_FEATURES</filename></ulink>
615 variable enables features specific to the kernel 613 variable enables features specific to the kernel
616 (e.g. VESA graphics support in this case). 614 (e.g. Intel GMA-500 DRM Driver in this case).
617 The append file points to specific commits in the 615 The append file points to specific commits in the
618 <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink> 616 <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>
619 Git repository and the <filename>meta</filename> Git repository 617 Git repository and the <filename>meta</filename> Git repository
@@ -1335,9 +1333,9 @@
1335 5) MIPS (32-bit) 1333 5) MIPS (32-bit)
1336 6) MIPS64 (64-bit) 1334 6) MIPS64 (64-bit)
1337 3 1335 3
1338 Would you like to use the default (3.17) kernel? (y/n) [default: y] y 1336 Would you like to use the default (3.19) kernel? (y/n) [default: y] y
1339 Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n] [default: y] 1337 Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n] [default: y]
1340 Getting branches from remote repo git://git.yoctoproject.org/linux-yocto-3.17.git... 1338 Getting branches from remote repo git://git.yoctoproject.org/linux-yocto-3.19.git...
1341 Please choose a machine branch to base your new BSP branch on: [default: standard/base] 1339 Please choose a machine branch to base your new BSP branch on: [default: standard/base]
1342 1) standard/arm-versatile-926ejs 1340 1) standard/arm-versatile-926ejs
1343 2) standard/base 1341 2) standard/base
@@ -1365,7 +1363,7 @@
1365 In the example, we use the ARM architecture. 1363 In the example, we use the ARM architecture.
1366 </para></listitem> 1364 </para></listitem>
1367 <listitem><para>The script then prompts you for the kernel. 1365 <listitem><para>The script then prompts you for the kernel.
1368 The default 3.17 kernel is acceptable. 1366 The default 3.19 kernel is acceptable.
1369 So, the example accepts the default. 1367 So, the example accepts the default.
1370 If you enter 'n', the script prompts you to further enter the kernel 1368 If you enter 'n', the script prompts you to further enter the kernel
1371 you do want to use.</para></listitem> 1369 you do want to use.</para></listitem>