diff options
| author | Mike Garrett <mike.garrett@hpe.com> | 2021-11-19 01:17:30 +0300 |
|---|---|---|
| committer | Mike Garrett <mike.garrett@hpe.com> | 2021-11-22 16:49:21 +0300 |
| commit | adbccbcfba95be603d690f800a9b39ee056472c9 (patch) | |
| tree | 5047335dcdc0245e3eb01a13cda2314f2595a949 /meta-hpe | |
| parent | 195ba3c2078d17874e9f63b033e21071aa3faadc (diff) | |
| download | openbmc-adbccbcfba95be603d690f800a9b39ee056472c9.tar.xz | |
meta-hpe: Move from 5.10 kernel to 5.14 with GXP support
This is a temporary stop on the way to 5.15
Signed-off-by: Mike Garrett <mike.garrett@hpe.com>
Change-Id: I5c750c61b3d3e1561eb4cfb53989bde9fd2b1e58
Diffstat (limited to 'meta-hpe')
| -rw-r--r-- | meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc | 1 | ||||
| -rw-r--r-- | meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig | 3 | ||||
| -rw-r--r-- | meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb (renamed from meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.10.bb) | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc index 5d79797f7..dfa9e806f 100644 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc +++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc @@ -21,4 +21,5 @@ require recipes-kernel/linux/linux-yocto.inc # From 4.16+ the COPYING file changed LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +KERNEL_FEATURES:remove = "phosphor-gpio-keys" diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig index cdd03e3f7..12e1eb636 100644 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig +++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig @@ -216,6 +216,7 @@ CONFIG_HPE_GXP_FN2=y CONFIG_HPE_GXP_CSM=y CONFIG_HPE_GXP_SROM=y CONFIG_HPE_GXP_CHIF=y +CONFIG_HPE_GXP_DBG=y CONFIG_PECI=y CONFIG_PECI_CHARDEV=y CONFIG_PECI_GXP=y @@ -277,3 +278,5 @@ CONFIG_DEBUG_UART_VIRT=0xF00000F0 CONFIG_DEBUG_UART_8250_SHIFT=0 CONFIG_EARLY_PRINTK=y CONFIG_TEST_KSTRTOX=y +CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y +CONFIG_FUSE_FS=y diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.10.bb b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb index d0b5407ae..030a6fa93 100644 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.10.bb +++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb @@ -1,6 +1,6 @@ -KBRANCH ?= "dev-5.10-gxp-openbmc" -LINUX_VERSION ?= "5.10.17" -SRCREV="8d942b456304d3a21597cda47387a45ace61a225" +KBRANCH ?= "dev-5.14-gxp-openbmc" +LINUX_VERSION ?= "5.14.0" +SRCREV="6f1a2c5c0cc59692d5beafe5ff8a4c7539b82d7d" require linux-obmc.inc require conf/machine/include/fitimage-sign.inc |