summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2017-02-14 16:14:23 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-19 06:16:58 -0800
commitc57ccdcb5bf76d11e5cf48de2b1fcfb91f790189 (patch)
treee2f4f9dc848285e4c5860ffcae909d2962dc8bcb
parent98f7fbfd6cd34339a79cb62fdd7491c12cca8d6c (diff)
downloadopenembedded-core-contrib-c57ccdcb5bf76d11e5cf48de2b1fcfb91f790189.tar.gz
openembedded-core-contrib-c57ccdcb5bf76d11e5cf48de2b1fcfb91f790189.tar.bz2
openembedded-core-contrib-c57ccdcb5bf76d11e5cf48de2b1fcfb91f790189.zip
linux-yocto/4.4: meta/configuration updates
Integrating the following commit already in 4.9 and 4.8: intel-quark: Add intel-quark-preempt-rt bsp configuration While there are intel-quark configurations for the KTYPEs standard and tiny in bsp/intel-common, there's none for the preempt-rt KTYPE. Trying to build preempt-rt enabled kernels such as linux-yocto-rt for intel-quark yields a .config having a potentially misconfigured architecture. More importantly, however, preempt-rt related CONFIG options are not enabled. Hence, a build of, e.g., linux-yocto-rt, does not result in a preempt-rt enabled kernel. This patch qualifies to be (back)ported to other branches than master. Signed-off-by: Christian Storm <christian.storm@siemens.com> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> (From OE-Core rev: e853327447908d1be085a96f8dda1c53305f9552) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 f5169b81bd..82f1a94f16 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
@@ -12,7 +12,7 @@ python () {
}
SRCREV_machine ?= "6622c6471016005d5588aa4338ce57aced713dcd"
-SRCREV_meta ?= "78a26182e20c0a49c1adda63faa15ccd3f4ecb27"
+SRCREV_meta ?= "f4a781388fae67caec79a5a571c8aadef0185044"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \
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 0baba1de53..6cb580dc3e 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"
KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2"
-SRCREV_meta ?= "78a26182e20c0a49c1adda63faa15ccd3f4ecb27"
+SRCREV_meta ?= "f4a781388fae67caec79a5a571c8aadef0185044"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
index 5ac3f561a5..34e0f38c03 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 ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2"
SRCREV_machine_qemux86-64 ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2"
SRCREV_machine_qemumips64 ?= "c74cc42106745bab08de6263b9320ac029f2cca9"
SRCREV_machine ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2"
-SRCREV_meta ?= "78a26182e20c0a49c1adda63faa15ccd3f4ecb27"
+SRCREV_meta ?= "f4a781388fae67caec79a5a571c8aadef0185044"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"