summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-07-07 14:39:04 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 10:28:43 +0100
commit92469ae0e3d47a365636641ba4a67d51abf83217 (patch)
treedf728012a4f5e4c39d1c18fc01f873c0834c8bc7
parent63ff759627fa7aa2325dcf373c078e7e47f7cc8c (diff)
downloadpoky-92469ae0e3d47a365636641ba4a67d51abf83217.tar.gz
linux-yocto/4.1/4.4: x86, power and usb-c mainline backports
Updating the 4.1 and 4.4 kernels with mainlin backports for platform/feature support. Also updating the kernel meta data to configure and use those new features. (From OE-Core rev: d33f1ccd8ddf8eeaf262267d8618f2422adda629) 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>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.1.bb18
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.4.bb18
6 files changed, 25 insertions, 25 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
index 2fe221182b..15494b6335 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
@@ -11,8 +11,8 @@ python () {
11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "68484fa68d060d947fc46b2e85c0c6f2381d3e55" 14SRCREV_machine ?= "1ab0fb3f54886c143066754df67eb6abe4c5d7f9"
15SRCREV_meta ?= "e978d15367ec69788c4a10d1e2a65bfa626c5d8c" 15SRCREV_meta ?= "886dacbd6290bbd5bb0632883f661fb57b232d94"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
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 86bf8a7ba7..106dc34508 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 () {
12} 12}
13 13
14SRCREV_machine ?= "3bdc347cc2087a0217e3acddccda5bb775cd570b" 14SRCREV_machine ?= "3bdc347cc2087a0217e3acddccda5bb775cd570b"
15SRCREV_meta ?= "44a610517357619a9ba827a597eef6d7f6e079f3" 15SRCREV_meta ?= "6f6ffd05b919b870b6b97c0200ff1fff4e614563"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" 18 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.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
index 432565f714..7503dd1b83 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.1.26"
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" 12SRCREV_machine ?= "6ea8af4a9bc8797d71e14d9e641d9e28b1dee917"
13SRCREV_meta ?= "e978d15367ec69788c4a10d1e2a65bfa626c5d8c" 13SRCREV_meta ?= "886dacbd6290bbd5bb0632883f661fb57b232d94"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
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 638b3db9e4..1df17848af 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.4.13"
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "13852755ecbf491848afbe40e66fc152bc70915b" 12SRCREV_machine ?= "26d9c4e612512486290bad4525cef5c69f5e485d"
13SRCREV_meta ?= "44a610517357619a9ba827a597eef6d7f6e079f3" 13SRCREV_meta ?= "6f6ffd05b919b870b6b97c0200ff1fff4e614563"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index b2cbc60677..f673609b7f 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/base"
11KBRANCH_qemux86-64 ?= "standard/base" 11KBRANCH_qemux86-64 ?= "standard/base"
12KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "df8f2bd306f5e22590991faee46e28f671fa19b3" 14SRCREV_machine_qemuarm ?= "ce593534958d0bc6a3d1bc3036f425b9d7d9f5f6"
15SRCREV_machine_qemuarm64 ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" 15SRCREV_machine_qemuarm64 ?= "6ea8af4a9bc8797d71e14d9e641d9e28b1dee917"
16SRCREV_machine_qemumips ?= "1bb60e693b913dacad698bec1cc08b350785e3d1" 16SRCREV_machine_qemumips ?= "f1566b7d9fafd16b5dd98a313ffae1cab493a1c3"
17SRCREV_machine_qemuppc ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" 17SRCREV_machine_qemuppc ?= "6ea8af4a9bc8797d71e14d9e641d9e28b1dee917"
18SRCREV_machine_qemux86 ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" 18SRCREV_machine_qemux86 ?= "6ea8af4a9bc8797d71e14d9e641d9e28b1dee917"
19SRCREV_machine_qemux86-64 ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" 19SRCREV_machine_qemux86-64 ?= "6ea8af4a9bc8797d71e14d9e641d9e28b1dee917"
20SRCREV_machine_qemumips64 ?= "b0e7bb69566a922a661c4902e496dce98cefeab9" 20SRCREV_machine_qemumips64 ?= "8bac527ccf5cef97eac0dec7d94fb8cb668d7e13"
21SRCREV_machine ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" 21SRCREV_machine ?= "6ea8af4a9bc8797d71e14d9e641d9e28b1dee917"
22SRCREV_meta ?= "e978d15367ec69788c4a10d1e2a65bfa626c5d8c" 22SRCREV_meta ?= "886dacbd6290bbd5bb0632883f661fb57b232d94"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
index 49ffd8deec..a91b9cedc7 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/base"
11KBRANCH_qemux86-64 ?= "standard/base" 11KBRANCH_qemux86-64 ?= "standard/base"
12KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "6f2317f8a00a3eb6a2b28ca51f336f61eb6fe160" 14SRCREV_machine_qemuarm ?= "e26115bb79a4ea6a26c6052766f1e65553841d51"
15SRCREV_machine_qemuarm64 ?= "13852755ecbf491848afbe40e66fc152bc70915b" 15SRCREV_machine_qemuarm64 ?= "26d9c4e612512486290bad4525cef5c69f5e485d"
16SRCREV_machine_qemumips ?= "9fc8fc49e5065f1ee76e964a4c0257291ab3e62a" 16SRCREV_machine_qemumips ?= "1b5479c3dd579143c03cfa97c25346104aff3f30"
17SRCREV_machine_qemuppc ?= "13852755ecbf491848afbe40e66fc152bc70915b" 17SRCREV_machine_qemuppc ?= "26d9c4e612512486290bad4525cef5c69f5e485d"
18SRCREV_machine_qemux86 ?= "13852755ecbf491848afbe40e66fc152bc70915b" 18SRCREV_machine_qemux86 ?= "26d9c4e612512486290bad4525cef5c69f5e485d"
19SRCREV_machine_qemux86-64 ?= "13852755ecbf491848afbe40e66fc152bc70915b" 19SRCREV_machine_qemux86-64 ?= "26d9c4e612512486290bad4525cef5c69f5e485d"
20SRCREV_machine_qemumips64 ?= "d1c1f36412d196b560ed9f19392e291b5492b94c" 20SRCREV_machine_qemumips64 ?= "565650ff074c7438081bd2ff0db4d7208d666ddf"
21SRCREV_machine ?= "13852755ecbf491848afbe40e66fc152bc70915b" 21SRCREV_machine ?= "26d9c4e612512486290bad4525cef5c69f5e485d"
22SRCREV_meta ?= "44a610517357619a9ba827a597eef6d7f6e079f3" 22SRCREV_meta ?= "6f6ffd05b919b870b6b97c0200ff1fff4e614563"
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}"