summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2015-03-04 06:39:06 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-06 10:44:41 +0000
commita79cdb51b879988aa56a2b3fc419ac110425e8a4 (patch)
tree5529ed6a5877c6bcd1bc960aca12fac94610ede7
parentf0b44ff4b4be8f4f9c09022782e6554e7c8cd22d (diff)
downloadpoky-a79cdb51b879988aa56a2b3fc419ac110425e8a4.tar.gz
bsp-guide, kernel-dev, ref-manual: KERNEL_FEATURES should refer to .scc files.
Tweak a number of doc lines so that the KERNEL_FEATURES variable refers directory to .scc files, and does not take advantage of potentially confusing shortcuts. (From yocto-docs rev: 6236fb098fc2d518f6f4f63e16b19a06a775d2d6) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/bsp-guide/bsp.xml2
-rw-r--r--documentation/kernel-dev/kernel-dev-advanced.xml4
-rw-r--r--documentation/ref-manual/ref-variables.xml6
3 files changed, 6 insertions, 6 deletions
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index abab3f4195..06b6f223d2 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -589,7 +589,7 @@
589 COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" 589 COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
590 KMACHINE_emenlow-noemgd = "emenlow" 590 KMACHINE_emenlow-noemgd = "emenlow"
591 KBRANCH_emenlow-noemgd = "standard/base" 591 KBRANCH_emenlow-noemgd = "standard/base"
592 KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" 592 KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500.scc"
593 593
594 LINUX_VERSION_emenlow-noemgd = "3.14.19" 594 LINUX_VERSION_emenlow-noemgd = "3.14.19"
595 SRCREV_machine_emenlow-noemgd = "902f34d36102a4b2008b776ecae686f80d307e12" 595 SRCREV_machine_emenlow-noemgd = "902f34d36102a4b2008b776ecae686f80d307e12"
diff --git a/documentation/kernel-dev/kernel-dev-advanced.xml b/documentation/kernel-dev/kernel-dev-advanced.xml
index 3707fcee9e..dc5d9ba3dd 100644
--- a/documentation/kernel-dev/kernel-dev-advanced.xml
+++ b/documentation/kernel-dev/kernel-dev-advanced.xml
@@ -136,12 +136,12 @@
136 For example, to include a feature specified as "features/netfilter.scc", 136 For example, to include a feature specified as "features/netfilter.scc",
137 specify: 137 specify:
138 <literallayout class='monospaced'> 138 <literallayout class='monospaced'>
139 KERNEL_FEATURES += "features/netfilter.scc" 139 KERNEL_FEATURES += "features/netfilter/netfilter.scc"
140 </literallayout> 140 </literallayout>
141 To include a feature called "cfg/sound.scc" just for the 141 To include a feature called "cfg/sound.scc" just for the
142 <filename>qemux86</filename> machine, specify: 142 <filename>qemux86</filename> machine, specify:
143 <literallayout class='monospaced'> 143 <literallayout class='monospaced'>
144 KERNEL_FEATURES_append_qemux86 = "cfg/sound.scc" 144 KERNEL_FEATURES_append_qemux86 = " cfg/sound.scc"
145 </literallayout> 145 </literallayout>
146 The value of the entries in <filename>KERNEL_FEATURES</filename> 146 The value of the entries in <filename>KERNEL_FEATURES</filename>
147 are dependent on their location within the kernel Metadata itself. 147 are dependent on their location within the kernel Metadata itself.
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 7122b47f2e..1135728fd2 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -5792,7 +5792,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
5792 COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" 5792 COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
5793 KMACHINE_emenlow-noemgd = "emenlow" 5793 KMACHINE_emenlow-noemgd = "emenlow"
5794 KBRANCH_emenlow-noemgd = "standard/base" 5794 KBRANCH_emenlow-noemgd = "standard/base"
5795 KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" 5795 KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500.scc"
5796 </literallayout> 5796 </literallayout>
5797 The <filename>KBRANCH</filename> statement identifies 5797 The <filename>KBRANCH</filename> statement identifies
5798 the kernel branch to use when building for the Emenlow 5798 the kernel branch to use when building for the Emenlow
@@ -5846,10 +5846,10 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
5846 machine: 5846 machine:
5847 <literallayout class='monospaced'> 5847 <literallayout class='monospaced'>
5848 # Add netfilter to all linux-yocto kernels 5848 # Add netfilter to all linux-yocto kernels
5849 KERNEL_FEATURES="features/netfilter" 5849 KERNEL_FEATURES="features/netfilter/netfilter.scc"
5850 5850
5851 # Add sound support to the qemux86 machine 5851 # Add sound support to the qemux86 machine
5852 KERNEL_FEATURES_append_qemux86=" cfg/sound" 5852 KERNEL_FEATURES_append_qemux86=" cfg/sound.scc"
5853 </literallayout></para> 5853 </literallayout></para>
5854 </glossdef> 5854 </glossdef>
5855 </glossentry> 5855 </glossentry>