summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-03-04 13:21:16 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-09 16:58:13 +0000
commit2408f498076f9220ef42f83a5a24959d5f1cb8d0 (patch)
tree85a6911e0e5b3a82172139b65a824a87eb1b2ea3 /meta
parent9ac029bd4a5c2b08dfef28c7a20ae1a460b0bfe1 (diff)
downloadpoky-2408f498076f9220ef42f83a5a24959d5f1cb8d0.tar.gz
linux-yocto/kernel-meta: ktype refactoring: move DEBUG_KERNEL, EXPERT and EMBEDDED
Integrating the folliwing patch series from Cal: This patch series refactors the ktypes so that base and standard ktypes do not enable EMBEDDED, EXPERT, or DEBUG_KERNEL. The reason this decision was made is because production platforms likely do not want DEBUG_KERNEL enabled, and EMBEDDED selects EXPERT which selects DEBUG_KERNEL. A new ktype called "developer" was also created. This ktype enables the options now missing from standard and base, making it easy to maintain the functionality of a BSP through simply swapping the ktype from standard to developer. The preempt-rt ktype is now based off of developer in order to maintain its functionality. The new standard ktype does not include EMBEDDED, EXPERT, or DEBUG_KERNEL. Without DEBUG_KERNEL it loses a number of debug features that are selected by default. Without EXPERT it gains RFKILL_INPUT and DEBUG_MEMORY_INIT, while losing VMSPLIT_3G. These are only available to configure with CONFIG_EXPERT=y and default to EXPERT or !EXPERT. Not selecting EMBEDDED has no apparent impacts. Some coordination is required for this change, as existing BSPs WILL be affected, and will either need to accept the changes in the standard ktype or move to the developer ktype. California Sullivan (12): features/debug: add debug-kernel feature ktypes: add developer ktype ktypes/base: Disable EMBEDDED and DEBUG_KERNEL CONFIG_PROCESSOR_SELECT: do not enable intel-common-drivers.scc: move profiling and latencytop to a new file romley.scc remove profiling and latencytop features bsp/intel-common: add intel-core* developer BSPs preempt-rt.scc: include developer ktype instead of standard intel-common: add intel-developer-drivers.scc to preempt-rt BSPs CONFIG_I2C_I801: set option to yes in intel-core* BSPs bsp: add developer common-pc BSPs bsp: remove profiling and latencytop from non-developer common-pc BSPs (From OE-Core rev: 928704f875e541efb61aee2146433c924398fc6c) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.4.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
index 7251c07fce..41619d7296 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
@@ -3,7 +3,7 @@ KBRANCH ?= "standard/preempt-rt"
3require recipes-kernel/linux/linux-yocto.inc 3require recipes-kernel/linux/linux-yocto.inc
4 4
5SRCREV_machine ?= "853991833cc5140ca25450e81bf6b822d537a6ac" 5SRCREV_machine ?= "853991833cc5140ca25450e81bf6b822d537a6ac"
6SRCREV_meta ?= "8b6a7d80344837fd64163008521a31a6f891313e" 6SRCREV_meta ?= "da47accec6c17c22cecf064be1da29b5bf3d7583"
7 7
8SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ 8SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \
9 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" 9 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
index 0d35bc3ce8..5a0884a487 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2" 12SRCREV_machine ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2"
13SRCREV_meta ?= "8b6a7d80344837fd64163008521a31a6f891313e" 13SRCREV_meta ?= "da47accec6c17c22cecf064be1da29b5bf3d7583"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
index c5f160d786..9c3fe7f1de 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2"
19SRCREV_machine_qemux86-64 ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2" 19SRCREV_machine_qemux86-64 ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2"
20SRCREV_machine_qemumips64 ?= "8bbcb369cf605d1ada384f4b950da2abc5d1f4cc" 20SRCREV_machine_qemumips64 ?= "8bbcb369cf605d1ada384f4b950da2abc5d1f4cc"
21SRCREV_machine ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2" 21SRCREV_machine ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2"
22SRCREV_meta ?= "8b6a7d80344837fd64163008521a31a6f891313e" 22SRCREV_meta ?= "da47accec6c17c22cecf064be1da29b5bf3d7583"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"