diff options
Diffstat (limited to 'documentation')
-rw-r--r-- | documentation/kernel-dev/kernel-dev-advanced.xml | 14 | ||||
-rw-r--r-- | documentation/ref-manual/ref-variables.xml | 18 |
2 files changed, 5 insertions, 27 deletions
diff --git a/documentation/kernel-dev/kernel-dev-advanced.xml b/documentation/kernel-dev/kernel-dev-advanced.xml index 283f483112..785076026d 100644 --- a/documentation/kernel-dev/kernel-dev-advanced.xml +++ b/documentation/kernel-dev/kernel-dev-advanced.xml | |||
@@ -66,19 +66,15 @@ | |||
66 | <literallayout class='monospaced'> | 66 | <literallayout class='monospaced'> |
67 | <ulink url='&YOCTO_DOCS_REF_URL;#var-KBRANCH'>KBRANCH</ulink> | 67 | <ulink url='&YOCTO_DOCS_REF_URL;#var-KBRANCH'>KBRANCH</ulink> |
68 | <ulink url='&YOCTO_DOCS_REF_URL;#var-KERNEL_FEATURES'>KERNEL_FEATURES</ulink> | 68 | <ulink url='&YOCTO_DOCS_REF_URL;#var-KERNEL_FEATURES'>KERNEL_FEATURES</ulink> |
69 | <ulink url='&YOCTO_DOCS_REF_URL;#var-KBRANCH_DEFAULT'>KBRANCH_DEFAULT</ulink> | ||
70 | <ulink url='&YOCTO_DOCS_REF_URL;#var-LINUX_KERNEL_TYPE'>LINUX_KERNEL_TYPE</ulink> | 69 | <ulink url='&YOCTO_DOCS_REF_URL;#var-LINUX_KERNEL_TYPE'>LINUX_KERNEL_TYPE</ulink> |
71 | </literallayout> | 70 | </literallayout> |
72 | <filename>KBRANCH_DEFAULT</filename> defines the Linux kernel source | 71 | <filename>KBRANCH</filename> defines the Linux kernel source |
73 | repository's default branch to use to build the Linux kernel. | 72 | repository's branch to use to build the Linux kernel. |
74 | The value is used as the default for <filename>KBRANCH</filename>, which | 73 | You can use the value to define an alternate branch typically with a |
75 | can define an alternate branch typically with a machine override as | 74 | machine override as follows: |
76 | follows: | ||
77 | <literallayout class='monospaced'> | 75 | <literallayout class='monospaced'> |
78 | KBRANCH_fri2 = "standard/fri2" | 76 | KBRANCH_fri2 ?= "standard/fri2" |
79 | </literallayout> | 77 | </literallayout> |
80 | Unless you specify otherwise, <filename>KBRANCH_DEFAULT</filename> | ||
81 | initializes to "master". | ||
82 | </para> | 78 | </para> |
83 | 79 | ||
84 | <para> | 80 | <para> |
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index 5271dcf8f6..6bcbbb316f 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml | |||
@@ -5802,24 +5802,6 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
5802 | </glossdef> | 5802 | </glossdef> |
5803 | </glossentry> | 5803 | </glossentry> |
5804 | 5804 | ||
5805 | <glossentry id='var-KBRANCH_DEFAULT'><glossterm>KBRANCH_DEFAULT</glossterm> | ||
5806 | <info> | ||
5807 | KBRANCH_DEFAULT[doc] = "Defines the Linux kernel source repository's default branch used to build the Linux kernel. Unless you specify otherwise, the variable initializes to 'master'." | ||
5808 | </info> | ||
5809 | <glossdef> | ||
5810 | <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> | ||
5811 | Defines the Linux kernel source repository's default | ||
5812 | branch used to build the Linux kernel. | ||
5813 | The <filename>KBRANCH_DEFAULT</filename> value is | ||
5814 | the default value for | ||
5815 | <link linkend='var-KBRANCH'><filename>KBRANCH</filename></link>. | ||
5816 | Unless you specify otherwise, | ||
5817 | <filename>KBRANCH_DEFAULT</filename> initializes to | ||
5818 | "master". | ||
5819 | </para> | ||
5820 | </glossdef> | ||
5821 | </glossentry> | ||
5822 | |||
5823 | <glossentry id='var-KERNEL_EXTRA_ARGS'><glossterm>KERNEL_EXTRA_ARGS</glossterm> | 5805 | <glossentry id='var-KERNEL_EXTRA_ARGS'><glossterm>KERNEL_EXTRA_ARGS</glossterm> |
5824 | <info> | 5806 | <info> |
5825 | KERNEL_EXTRA_ARGS[doc] = "Specifies additional make command-line arguments the OpenEmbedded build system passes on when compiling the kernel." | 5807 | KERNEL_EXTRA_ARGS[doc] = "Specifies additional make command-line arguments the OpenEmbedded build system passes on when compiling the kernel." |