diff options
author | Joel Stanley <joel@jms.id.au> | 2021-02-25 06:33:26 +0300 |
---|---|---|
committer | Joel Stanley <joel@jms.id.au> | 2021-03-01 07:53:39 +0300 |
commit | b1ff1bd2067beed2425de13d4d75beb0fbe2dc17 (patch) | |
tree | 5ede129e3dcd8de9fc4be93578156344f4cfbda2 /meta-phosphor/conf/distro/include/phosphor-base.inc | |
parent | 6da0524cb61888039bd5960461904e8c4c21f5da (diff) | |
download | openbmc-b1ff1bd2067beed2425de13d4d75beb0fbe2dc17.tar.xz |
Remove phsophor-gpio-keys as a standalone feature
The feature was implemented as an append to the kernel (BSP) layers in
meta-phsophor. This created a three way dance between machine layers,
BSP and meta-phosphor, when it should have been the kernel layer
providing this feature and machines could then opt in.
Fixing this means we could remove the KERNEL_DANGLING_FEATURES_WARN_ONLY
workaround.
As the feature is simply turning on a pair of kernel options without any
other impact, we can implement it by adding the options to our
defconfigs. In fact, aspeed and hpe kernel configurations enable the two
kernel options:
$ git grep CONFIG_KEYBOARD_GPIO=y
meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig:CONFIG_KEYBOARD_GPIO=y
meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig:CONFIG_KEYBOARD_GPIO=y
meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig:CONFIG_KEYBOARD_GPIO=y
meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig:CONFIG_KEYBOARD_GPIO=y
$ git grep CONFIG_INPUT_EVDEV
meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig:CONFIG_INPUT_EVDEV=y
meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig:CONFIG_INPUT_EVDEV=y
meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig:CONFIG_INPUT_EVDEV=y
meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig:CONFIG_INPUT_EVDEV=y
Other machines that wish to enable this feature should ensure it is
added to their BSP's defconfig, or add it to their machine specific
defconfig.
Change-Id: I0726836319022f96c1d13d4a0cbd73708047302c
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'meta-phosphor/conf/distro/include/phosphor-base.inc')
-rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-base.inc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index b1b3885c4b..af2e6ef76e 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -117,9 +117,6 @@ DISTRO_EXTRA_RDEPENDS_remove_qemuarm = "packagegroup-core-device-devel" include conf/distro/include/openbmc-phosphor/${MACHINE}.inc -KERNEL_FEATURES_append = " phosphor-gpio-keys" -KERNEL_FEATURES_remove_qemuall = " phosphor-gpio-keys" - IMAGE_CLASSES_append = " image_types_phosphor phosphor-rootfs-postcommands" IMAGE_CLASSES_append_npcm7xx = " image_types_phosphor_nuvoton" |