From b77596aad9bd52d2491139e31ea24f6afdc2b461 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Mon, 23 Feb 2015 10:08:00 -0800
Subject: [PATCH] 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>
---
 documentation/ref-manual/ref-variables.xml | 35 +++++++++-------------
 1 file 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"
                     Values for this variable are set in the kernel's recipe
                     file and the kernel's append file.
                     For example, if you are using the Yocto Project kernel that
-                    is based on the Linux 3.10 kernel, the kernel recipe file
+                    is based on the Linux 3.14 kernel, the kernel recipe file
                     is the
-                    <filename>meta/recipes-kernel/linux/linux-yocto_3.10.bb</filename>
+                    <filename>meta/recipes-kernel/linux/linux-yocto_3.14.bb</filename>
                     file.
                     Following is the default value for <filename>KBRANCH</filename>
                     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"
      KBRANCH_DEFAULT = "standard/base"
      KBRANCH = "${KBRANCH_DEFAULT}"
                     </literallayout>
-                    This branch exists in the <filename>linux-yocto-3.10</filename>
+                    This branch exists in the <filename>linux-yocto-3.14</filename>
                     kernel Git repository
-                    <ulink url='&YOCTO_GIT_URL;/cgit.cgi/linux-yocto-3.10/refs/heads'></ulink>.
+                    <ulink url='&YOCTO_GIT_URL;/cgit.cgi/linux-yocto-3.14/refs/heads'></ulink>.
                 </para>
 
                 <para>
@@ -5768,26 +5768,19 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     machine or target hardware.
                     The kernel's append file is located in the BSP layer for
                     a given machine.
-                    For example, the kernel append file for the Crown Bay BSP is in the
+                    For example, the kernel append file for the Emenlow BSP is in the
                     <filename>meta-intel</filename> Git repository and is named
-                    <filename>meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend</filename>.
+                    <filename>meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend</filename>.
                     Here are the related statements from the append file:
                     <literallayout class='monospaced'>
-     COMPATIBLE_MACHINE_crownbay = "crownbay"
-     KMACHINE_crownbay = "crownbay"
-     KBRANCH_crownbay = "standard/crownbay"
-     KERNEL_FEATURES_append_crownbay = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
-
-     COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
-     KMACHINE_crownbay-noemgd = "crownbay"
-     KBRANCH_crownbay-noemgd = "standard/crownbay"
-     KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
+     COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
+     KMACHINE_emenlow-noemgd = "emenlow"
+     KBRANCH_emenlow-noemgd = "standard/base"
+     KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
                     </literallayout>
-                        The <filename>KBRANCH_*</filename> statements identify
-                        the kernel branch to use when building for the Crown
-                        Bay BSP.
-                        In this case there are two identical statements: one
-                        for each type of Crown Bay machine.
+                        The <filename>KBRANCH</filename> statement identifies
+                        the kernel branch to use when building for the Emenlow
+                        BSP.
                 </para>
             </glossdef>
         </glossentry>
@@ -8491,7 +8484,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     Here are two examples:
                     <literallayout class='monospaced'>
      PREFERRED_VERSION_python = "2.7.3"
-     PREFERRED_VERSION_linux-yocto = "3.10%"
+     PREFERRED_VERSION_linux-yocto = "3.19%"
                     </literallayout>
                 </para>
             </glossdef>