From 358fa56efa2db2a5276a910676e2e6093fe2da0f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 27 Jun 2016 22:36:43 -0400 Subject: linux-yocto: bxt and input configuration changes Merging the following two configuration changes: Author: Rebecca Chang Swee Fun Date: Mon Jun 27 15:11:04 2016 +0800 broxton: set CONFIG_GPIO_GENERIC_PLATFORM instead of CONFIG_GPIO_GENERIC CONFIG_GPIO_GENERIC option is tristate, this will ensure we enable by selecting CONFIG_GPIO_GENERIC_PLATFORM. This addresses the following message: Value requested for CONFIG_GPIO_GENERIC not in final ".config" Requested value: "CONFIG_GPIO_GENERIC=y" Actual value set: "" Signed-off-by: Rebecca Chang Swee Fun Author: California Sullivan Date: Mon Jun 27 17:15:53 2016 -0700 features/input: Add keyboard-gpio feature This feature adds keyboard-gpio support to the kernel. We also add a specific implementation by default. More can be added as necessary. Signed-off-by: California Sullivan Signed-off-by: Bruce Ashfield Signed-off-by: Bruce Ashfield Signed-off-by: Ross Burton --- meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.4.bb | 2 +- 6 files changed, 6 insertions(+), 6 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 29a0aa77dd..2fe221182b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "68484fa68d060d947fc46b2e85c0c6f2381d3e55" -SRCREV_meta ?= "51216d70967be79dbe6c75ed4c7979abd4b95272" +SRCREV_meta ?= "e978d15367ec69788c4a10d1e2a65bfa626c5d8c" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ 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 34771aa759..86bf8a7ba7 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 ?= "29c7a2a5b02c1376b3345eeedea12c42806e89d9" +SRCREV_meta ?= "44a610517357619a9ba827a597eef6d7f6e079f3" 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.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb index 67e12a52a4..432565f714 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb @@ -10,7 +10,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" -SRCREV_meta ?= "51216d70967be79dbe6c75ed4c7979abd4b95272" +SRCREV_meta ?= "e978d15367ec69788c4a10d1e2a65bfa626c5d8c" PV = "${LINUX_VERSION}+git${SRCPV}" 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 01f179a4fd..638b3db9e4 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 ?= "13852755ecbf491848afbe40e66fc152bc70915b" -SRCREV_meta ?= "29c7a2a5b02c1376b3345eeedea12c42806e89d9" +SRCREV_meta ?= "44a610517357619a9ba827a597eef6d7f6e079f3" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index 66cddeb14b..b2cbc60677 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" SRCREV_machine_qemux86-64 ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" SRCREV_machine_qemumips64 ?= "b0e7bb69566a922a661c4902e496dce98cefeab9" SRCREV_machine ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" -SRCREV_meta ?= "51216d70967be79dbe6c75ed4c7979abd4b95272" +SRCREV_meta ?= "e978d15367ec69788c4a10d1e2a65bfa626c5d8c" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ 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 6e745edffa..49ffd8deec 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 ?= "13852755ecbf491848afbe40e66fc152bc70915b" SRCREV_machine_qemux86-64 ?= "13852755ecbf491848afbe40e66fc152bc70915b" SRCREV_machine_qemumips64 ?= "d1c1f36412d196b560ed9f19392e291b5492b94c" SRCREV_machine ?= "13852755ecbf491848afbe40e66fc152bc70915b" -SRCREV_meta ?= "29c7a2a5b02c1376b3345eeedea12c42806e89d9" +SRCREV_meta ?= "44a610517357619a9ba827a597eef6d7f6e079f3" 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 v1.2.3