From 5218a27645b57f0d38d9b17bcb2f41e3e04c0d67 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 7 Jul 2016 14:39:07 -0400 Subject: 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 Signed-off-by: Bruce Ashfield Signed-off-by: Ross Burton --- meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.4.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-kernel') 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 () { } SRCREV_machine ?= "3bdc347cc2087a0217e3acddccda5bb775cd570b" -SRCREV_meta ?= "4ebb8be6799bf2b738d46a3db49ebe59187f3b96" +SRCREV_meta ?= "01ac19ede037b753d2b3f0adb20ab1becb7e1511" 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 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" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "0e30a74f2cbbab0c7014561fe4eab1c9d8bfe560" -SRCREV_meta ?= "4ebb8be6799bf2b738d46a3db49ebe59187f3b96" +SRCREV_meta ?= "01ac19ede037b753d2b3f0adb20ab1becb7e1511" 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 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" SRCREV_machine_qemux86-64 ?= "0e30a74f2cbbab0c7014561fe4eab1c9d8bfe560" SRCREV_machine_qemumips64 ?= "14a513a5ba6a6b6968347014040d800496339622" SRCREV_machine ?= "0e30a74f2cbbab0c7014561fe4eab1c9d8bfe560" -SRCREV_meta ?= "4ebb8be6799bf2b738d46a3db49ebe59187f3b96" +SRCREV_meta ?= "01ac19ede037b753d2b3f0adb20ab1becb7e1511" 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}" -- cgit 1.2.3-korg