summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-02-06 11:21:55 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-19 23:53:34 +0000
commitf47fedbb4218ac8d411c657ba583364273e274ca (patch)
tree33881f72da6782f0decf91f6a8fa9bfaccb070c3
parent1c55a7e4b5022b1f7289f86ca75e0eeeb0bc2403 (diff)
downloadpoky-f47fedbb4218ac8d411c657ba583364273e274ca.tar.gz
linux-yocto/4.12: pinctrl backports
Backporting the following pinctrl commits to enable controllers on Intel Cannon Lake: 4b7a5c1b4ec5 pinctrl: intel: Add Intel Cannon Lake PCH-H pin controller support 044631ce1937 pinctrl: intel: Add Intel Cannon Lake PCH pin controller support 2054b0ea59a7 pinctrl: intel: Make it possible to specify mode per pin in a group 55b9053b5a5a pinctrl: intel: Add support for variable size pad groups (From OE-Core rev: 7636a42fb615b9ea4881483a61d3dac0ec72a5a6) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 4c05eb243c2cf10304383f6265721b695750cb9b) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.12.bb18
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
index 51de1e29d1..6fcf8c49f3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.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 ?= "f095b0588b491bb81854fbc168479cf5ff8a03ff" 14SRCREV_machine ?= "21541338928449e6131e73bfd529f5214027d918"
15SRCREV_meta ?= "44a22d45cbcd7e14ea635d36949e14135f540fe0" 15SRCREV_meta ?= "7986844d9de597218a23f82e68b01e5bf060d576"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
index c516d5de69..5ac407c4dc 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.12.19"
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "257f843ea367744620f1d92910afd2f454e31483" 12SRCREV_machine ?= "4b7a5c1b4ec5536806942340755bcfbf6f3584d9"
13SRCREV_meta ?= "44a22d45cbcd7e14ea635d36949e14135f540fe0" 13SRCREV_meta ?= "7986844d9de597218a23f82e68b01e5bf060d576"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb
index d7b6e2750d..f2db5174ac 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.12.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 ?= "dafca619b2bd44966042bba76aa00edb0ca002df" 14SRCREV_machine_qemuarm ?= "77d25f21501511f01eb3df3c58dd8cf10a90adce"
15SRCREV_machine_qemuarm64 ?= "257f843ea367744620f1d92910afd2f454e31483" 15SRCREV_machine_qemuarm64 ?= "4b7a5c1b4ec5536806942340755bcfbf6f3584d9"
16SRCREV_machine_qemumips ?= "99c30bfd13f4cc364e55b67138705976bab193c9" 16SRCREV_machine_qemumips ?= "567ea03f6c5844bed62957b20747b4315851e3c3"
17SRCREV_machine_qemuppc ?= "257f843ea367744620f1d92910afd2f454e31483" 17SRCREV_machine_qemuppc ?= "4b7a5c1b4ec5536806942340755bcfbf6f3584d9"
18SRCREV_machine_qemux86 ?= "257f843ea367744620f1d92910afd2f454e31483" 18SRCREV_machine_qemux86 ?= "4b7a5c1b4ec5536806942340755bcfbf6f3584d9"
19SRCREV_machine_qemux86-64 ?= "257f843ea367744620f1d92910afd2f454e31483" 19SRCREV_machine_qemux86-64 ?= "4b7a5c1b4ec5536806942340755bcfbf6f3584d9"
20SRCREV_machine_qemumips64 ?= "135d85c1f8cded6b68d533a0018b2897230b880c" 20SRCREV_machine_qemumips64 ?= "4796b8299a405d1428f000cc4a2e8800a3670541"
21SRCREV_machine ?= "257f843ea367744620f1d92910afd2f454e31483" 21SRCREV_machine ?= "4b7a5c1b4ec5536806942340755bcfbf6f3584d9"
22SRCREV_meta ?= "44a22d45cbcd7e14ea635d36949e14135f540fe0" 22SRCREV_meta ?= "7986844d9de597218a23f82e68b01e5bf060d576"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}"