diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-07-07 14:39:07 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:28:43 +0100 |
commit | 6ae50db71e71a50dc24134059fee359a27900ef7 (patch) | |
tree | dd2d2b6bcfc4cdb3788cf0860f36034db51b1db7 | |
parent | 0c5b11a7015646b3fa539af0a6dbd664a0da48dc (diff) | |
download | poky-6ae50db71e71a50dc24134059fee359a27900ef7.tar.gz |
linux-yocto/config: mei, gpio and usb type c
Merging the following configuration changes into the 4.1 and
4.4 linux-yocto kernel meta data:
mei.cfg: mei driver is no longer in staging
bsp/intel-common: add keyboard-gpio to intel-common-drivers
features/thermal: Enable Intel PMIC thermal feature
broxton: Enable USB Type C feature for broxton
(From OE-Core rev: 5218a27645b57f0d38d9b17bcb2f41e3e04c0d67)
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.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.4.bb | 2 |
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 eb99e6ebab..63b2c7f2ce 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 | ||
14 | SRCREV_machine ?= "3bdc347cc2087a0217e3acddccda5bb775cd570b" | 14 | SRCREV_machine ?= "3bdc347cc2087a0217e3acddccda5bb775cd570b" |
15 | SRCREV_meta ?= "4ebb8be6799bf2b738d46a3db49ebe59187f3b96" | 15 | SRCREV_meta ?= "01ac19ede037b753d2b3f0adb20ab1becb7e1511" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb index 4e63eb0c5f..51cca1283a 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" | |||
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "0e30a74f2cbbab0c7014561fe4eab1c9d8bfe560" | 12 | SRCREV_machine ?= "0e30a74f2cbbab0c7014561fe4eab1c9d8bfe560" |
13 | SRCREV_meta ?= "4ebb8be6799bf2b738d46a3db49ebe59187f3b96" | 13 | SRCREV_meta ?= "01ac19ede037b753d2b3f0adb20ab1becb7e1511" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${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 46a0e827c4..bfcf04dbc2 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 ?= "0e30a74f2cbbab0c7014561fe4eab1c9d8bfe560" | |||
19 | SRCREV_machine_qemux86-64 ?= "0e30a74f2cbbab0c7014561fe4eab1c9d8bfe560" | 19 | SRCREV_machine_qemux86-64 ?= "0e30a74f2cbbab0c7014561fe4eab1c9d8bfe560" |
20 | SRCREV_machine_qemumips64 ?= "14a513a5ba6a6b6968347014040d800496339622" | 20 | SRCREV_machine_qemumips64 ?= "14a513a5ba6a6b6968347014040d800496339622" |
21 | SRCREV_machine ?= "0e30a74f2cbbab0c7014561fe4eab1c9d8bfe560" | 21 | SRCREV_machine ?= "0e30a74f2cbbab0c7014561fe4eab1c9d8bfe560" |
22 | SRCREV_meta ?= "4ebb8be6799bf2b738d46a3db49ebe59187f3b96" | 22 | SRCREV_meta ?= "01ac19ede037b753d2b3f0adb20ab1becb7e1511" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_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}" |