kernel-dev: Miscellaneous Edits to Advanced Metadata chapter

(From yocto-docs rev: 74e27b697efa7ea7ecc1d1d59266b537dd70ae98)

Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Rifenbark 2017-10-02 17:31:06 -07:00 committed by Richard Purdie
parent dc2f2ae714
commit 42303c0d9f

View File

@ -327,7 +327,7 @@
# Increase default NR_CPUS from 8 to 64 so that platform with
# more than 8 processors can be all activated at boot time
CONFIG_NR_CPUS=64
# The following is nedded when setting NR_CPUS to something
# The following is needed when setting NR_CPUS to something
# greater than 8 on x86 architectures, it should be automatically
# disregarded by Kconfig when using a different arch
CONFIG_X86_BIGSMP=y
@ -697,7 +697,7 @@
Metadata as it is here, you only need to ensure that the
<ulink url='&YOCTO_DOCS_REF_URL;#var-LINUX_KERNEL_TYPE'><filename>LINUX_KERNEL_TYPE</filename></ulink>
variable in the kernel recipe and the
<filename>KTYPE</filename> variable in the BSP descriptionn
<filename>KTYPE</filename> variable in the BSP description
file match.
<note>
Future versions of the tooling make the specification of
@ -1133,10 +1133,9 @@
</para>
<para>
If you find
yourself with numerous branches, you might consider using a
hierarchical branching system similar to what the linux-yocto Linux
kernel repositories use:
If you find yourself with numerous branches, you might consider
using a hierarchical branching system similar to what the
Yocto Linux Kernel Git repositories use:
<literallayout class='monospaced'>
<replaceable>common</replaceable>/<replaceable>kernel_type</replaceable>/<replaceable>machine</replaceable>
</literallayout>
@ -1166,7 +1165,8 @@
The "standard" and "small" branches add sources specific to those
kernel types that for whatever reason are not appropriate for the
other branches.
<note>The "base" branches are an artifact of the way Git manages
<note>
The "base" branches are an artifact of the way Git manages
its data internally on the filesystem: Git will not allow you
to use <filename>mydir/standard</filename> and
<filename>mydir/standard/machine_a</filename> because it
@ -1213,27 +1213,34 @@
This section provides a brief reference for the commands you can use
within an SCC description file (<filename>.scc</filename>):
<itemizedlist>
<listitem><para><filename>branch [ref]</filename>:
<listitem><para>
<filename>branch [ref]</filename>:
Creates a new branch relative to the current branch
(typically <filename>${KTYPE}</filename>) using
the currently checked-out branch, or "ref" if specified.
</para></listitem>
<listitem><para><filename>define</filename>:
<listitem><para>
<filename>define</filename>:
Defines variables, such as <filename>KMACHINE</filename>,
<filename>KTYPE</filename>, <filename>KARCH</filename>,
and <filename>KFEATURE_DESCRIPTION</filename>.</para></listitem>
<listitem><para><filename>include SCC_FILE</filename>:
<listitem><para>
<filename>include SCC_FILE</filename>:
Includes an SCC file in the current file.
The file is parsed as if you had inserted it inline.
</para></listitem>
<listitem><para><filename>kconf [hardware|non-hardware] CFG_FILE</filename>:
<listitem><para>
<filename>kconf [hardware|non-hardware] CFG_FILE</filename>:
Queues a configuration fragment for merging into the final
Linux <filename>.config</filename> file.</para></listitem>
<listitem><para><filename>git merge GIT_BRANCH</filename>:
<listitem><para>
<filename>git merge GIT_BRANCH</filename>:
Merges the feature branch into the current branch.
</para></listitem>
<listitem><para><filename>patch PATCH_FILE</filename>:
Applies the patch to the current Git branch.</para></listitem>
<listitem><para>
<filename>patch PATCH_FILE</filename>:
Applies the patch to the current Git branch.
</para></listitem>
</itemizedlist>
</para>
</section>