From b49a5ccc5b625abb97dd13bc43c6101eb13954dd Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Mon, 2 Mar 2015 08:27:29 -0800
Subject: kernel-dev: Clarify a couple minor things in kernel manual, ch 2.

Some small changes to clarify how to change the configuration.

(From yocto-docs rev: fce7c97abb69f15142dbadf90a90965a49ec3e0e)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/kernel-dev/kernel-dev-common.xml | 28 +++++++++++++++-----------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'documentation/kernel-dev')

diff --git a/documentation/kernel-dev/kernel-dev-common.xml b/documentation/kernel-dev/kernel-dev-common.xml
index 56fa17d7d8..87cf2b3864 100644
--- a/documentation/kernel-dev/kernel-dev-common.xml
+++ b/documentation/kernel-dev/kernel-dev-common.xml
@@ -156,23 +156,27 @@
             <title>Changing the Configuration</title>
 
             <para>
-                You can make wholesale or incremental changes to the Linux
-                kernel <filename>.config</filename> file by including a
-                <filename>defconfig</filename> and by specifying
+                You can make wholesale or incremental changes to the final
+                <filename>.config</filename> file used for the eventual
+                Linux kernel configuration by including a
+                <filename>defconfig</filename> file and by specifying
                 configuration fragments in the
-                <ulink url='&YOCTO_DOCS_REF_URL;#var-SRC_URI'><filename>SRC_URI</filename></ulink>.
+                <ulink url='&YOCTO_DOCS_REF_URL;#var-SRC_URI'><filename>SRC_URI</filename></ulink>
+                to be applied to that file.
             </para>
 
             <para>
-                If you have a final Linux kernel <filename>.config</filename>
-                file you want to use, copy it to a directory named
-                <filename>files</filename>, which must be in
-                your layer's <filename>recipes-kernel/linux</filename>
-                directory, and name the file "defconfig".
-                Then, add the following lines to your linux-yocto
+                If you have a complete, working Linux kernel
+                <filename>.config</filename>
+                file you want to use for the configuration, as before, copy
+                that file to the appropriate <filename>${PN}</filename>
+                directory in your layer's
+                <filename>recipes-kernel/linux</filename> directory,
+                and rename the copied file to "defconfig".
+                Then, add the following lines to the linux-yocto
                 <filename>.bbappend</filename> file in your layer:
                 <literallayout class='monospaced'>
-     FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+     FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
      SRC_URI += "file://defconfig"
                 </literallayout>
                 The <filename>SRC_URI</filename> tells the build system how to
@@ -181,7 +185,7 @@
                 extends the
                 <ulink url='&YOCTO_DOCS_REF_URL;#var-FILESPATH'><filename>FILESPATH</filename></ulink>
                 variable (search directories) to include the
-                <filename>files</filename> directory you created for the
+                <filename>${PN}</filename> directory you created to hold the
                 configuration changes.
             </para>
 
-- 
cgit v1.2.3-54-g00ecf