summaryrefslogtreecommitdiffstats
path: root/documentation/ref-manual/ref-variables.xml
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2015-02-23 10:08:00 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-24 23:36:13 +0000
commitb77596aad9bd52d2491139e31ea24f6afdc2b461 (patch)
treed01c2a55700e2a1021f1805734aeb3653a78e183 /documentation/ref-manual/ref-variables.xml
parentf94b6298d87ee3392a24d8e0f0be2ccf2ebce2ef (diff)
downloadpoky-b77596aad9bd52d2491139e31ea24f6afdc2b461.tar.gz
ref-manual: Updates to scrub out 3.10 kernel.
Two areas affected by this change. I updated the KBRANCH and PREFERRED_VERSION variables in the glossary. One change in the KBRANCH area was getting rid of the deprecated Crown Bay example. I substituted in the Emenlow BSP. (From yocto-docs rev: d7ed727ab5828dc257361c558a86a298bc537748) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/ref-manual/ref-variables.xml')
-rw-r--r--documentation/ref-manual/ref-variables.xml35
1 files changed, 14 insertions, 21 deletions
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 8d444a4687..6329cc2f5a 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -5746,9 +5746,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
5746 Values for this variable are set in the kernel's recipe 5746 Values for this variable are set in the kernel's recipe
5747 file and the kernel's append file. 5747 file and the kernel's append file.
5748 For example, if you are using the Yocto Project kernel that 5748 For example, if you are using the Yocto Project kernel that
5749 is based on the Linux 3.10 kernel, the kernel recipe file 5749 is based on the Linux 3.14 kernel, the kernel recipe file
5750 is the 5750 is the
5751 <filename>meta/recipes-kernel/linux/linux-yocto_3.10.bb</filename> 5751 <filename>meta/recipes-kernel/linux/linux-yocto_3.14.bb</filename>
5752 file. 5752 file.
5753 Following is the default value for <filename>KBRANCH</filename> 5753 Following is the default value for <filename>KBRANCH</filename>
5754 and the default override for the architectures the Yocto 5754 and the default override for the architectures the Yocto
@@ -5757,9 +5757,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
5757 KBRANCH_DEFAULT = "standard/base" 5757 KBRANCH_DEFAULT = "standard/base"
5758 KBRANCH = "${KBRANCH_DEFAULT}" 5758 KBRANCH = "${KBRANCH_DEFAULT}"
5759 </literallayout> 5759 </literallayout>
5760 This branch exists in the <filename>linux-yocto-3.10</filename> 5760 This branch exists in the <filename>linux-yocto-3.14</filename>
5761 kernel Git repository 5761 kernel Git repository
5762 <ulink url='&YOCTO_GIT_URL;/cgit.cgi/linux-yocto-3.10/refs/heads'></ulink>. 5762 <ulink url='&YOCTO_GIT_URL;/cgit.cgi/linux-yocto-3.14/refs/heads'></ulink>.
5763 </para> 5763 </para>
5764 5764
5765 <para> 5765 <para>
@@ -5768,26 +5768,19 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
5768 machine or target hardware. 5768 machine or target hardware.
5769 The kernel's append file is located in the BSP layer for 5769 The kernel's append file is located in the BSP layer for
5770 a given machine. 5770 a given machine.
5771 For example, the kernel append file for the Crown Bay BSP is in the 5771 For example, the kernel append file for the Emenlow BSP is in the
5772 <filename>meta-intel</filename> Git repository and is named 5772 <filename>meta-intel</filename> Git repository and is named
5773 <filename>meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend</filename>. 5773 <filename>meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend</filename>.
5774 Here are the related statements from the append file: 5774 Here are the related statements from the append file:
5775 <literallayout class='monospaced'> 5775 <literallayout class='monospaced'>
5776 COMPATIBLE_MACHINE_crownbay = "crownbay" 5776 COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
5777 KMACHINE_crownbay = "crownbay" 5777 KMACHINE_emenlow-noemgd = "emenlow"
5778 KBRANCH_crownbay = "standard/crownbay" 5778 KBRANCH_emenlow-noemgd = "standard/base"
5779 KERNEL_FEATURES_append_crownbay = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" 5779 KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
5780
5781 COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
5782 KMACHINE_crownbay-noemgd = "crownbay"
5783 KBRANCH_crownbay-noemgd = "standard/crownbay"
5784 KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
5785 </literallayout> 5780 </literallayout>
5786 The <filename>KBRANCH_*</filename> statements identify 5781 The <filename>KBRANCH</filename> statement identifies
5787 the kernel branch to use when building for the Crown 5782 the kernel branch to use when building for the Emenlow
5788 Bay BSP. 5783 BSP.
5789 In this case there are two identical statements: one
5790 for each type of Crown Bay machine.
5791 </para> 5784 </para>
5792 </glossdef> 5785 </glossdef>
5793 </glossentry> 5786 </glossentry>
@@ -8491,7 +8484,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
8491 Here are two examples: 8484 Here are two examples:
8492 <literallayout class='monospaced'> 8485 <literallayout class='monospaced'>
8493 PREFERRED_VERSION_python = "2.7.3" 8486 PREFERRED_VERSION_python = "2.7.3"
8494 PREFERRED_VERSION_linux-yocto = "3.10%" 8487 PREFERRED_VERSION_linux-yocto = "3.19%"
8495 </literallayout> 8488 </literallayout>
8496 </para> 8489 </para>
8497 </glossdef> 8490 </glossdef>