diff options
4 files changed, 14 insertions, 0 deletions
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc b/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc index fc4a4f9c5..c26f4afb2 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc @@ -8,6 +8,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" KSRC ?= "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}" SRC_URI = "${KSRC}" +SRC_URI += "file://phosphor-gpio-keys.scc" +SRC_URI += "file://phosphor-gpio-keys.cfg" SRC_URI += "file://v3-0001-drivers-fsi-Increase-delay-before-sampling-input-.patch" LINUX_VERSION_EXTENSION ?= "-${SRCREV}" diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.cfg b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.cfg new file mode 100644 index 000000000..f5c01bed7 --- /dev/null +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.cfg @@ -0,0 +1,7 @@ +CONFIG_INPUT_KEYBOARD=y +# CONFIG_INPUT_LEDS is not set +# CONFIG_INPUT_MOUSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_KEYBOARD_ATKBD is not set +CONFIG_KEYBOARD_GPIO=y +# CONFIG_INPUT_MOUSE is not set diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.scc b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.scc new file mode 100644 index 000000000..78961af7a --- /dev/null +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.scc @@ -0,0 +1,2 @@ +define KFEATURE_DESCRIPTION "Enable gpio-keys" +kconf non-hardware phosphor-gpio-keys.cfg diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index fa488e59d..abea01e4c 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -56,3 +56,6 @@ include conf/distro/include/openbmc-phosphor/${MACHINE}.inc # the version in RHEL6.4. INHERIT_remove = " uninative" OLDEST_KERNEL = "2.6.32" + +KERNEL_FEATURES_append = " phosphor-gpio-keys" +KERNEL_FEATURES_remove_qemuall = " phosphor-gpio-keys" |
