From adbccbcfba95be603d690f800a9b39ee056472c9 Mon Sep 17 00:00:00 2001 From: Mike Garrett Date: Thu, 18 Nov 2021 16:17:30 -0600 Subject: 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 Change-Id: I5c750c61b3d3e1561eb4cfb53989bde9fd2b1e58 --- meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc | 1 + meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig | 3 +++ meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.10.bb | 10 ---------- meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb | 10 ++++++++++ 4 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.10.bb create mode 100644 meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb (limited to 'meta-hpe/meta-gxp/recipes-kernel/linux') 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.10.bb deleted file mode 100644 index d0b5407ae..000000000 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.10.bb +++ /dev/null @@ -1,10 +0,0 @@ -KBRANCH ?= "dev-5.10-gxp-openbmc" -LINUX_VERSION ?= "5.10.17" -SRCREV="8d942b456304d3a21597cda47387a45ace61a225" - -require linux-obmc.inc -require conf/machine/include/fitimage-sign.inc - -# OpenBMC loads in kernel features via other mechanisms so this check -# in the kernel-yocto.bbclass is not required -#KERNEL_DANGLING_FEATURES_WARN_ONLY="1" diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb new file mode 100644 index 000000000..030a6fa93 --- /dev/null +++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb @@ -0,0 +1,10 @@ +KBRANCH ?= "dev-5.14-gxp-openbmc" +LINUX_VERSION ?= "5.14.0" +SRCREV="6f1a2c5c0cc59692d5beafe5ff8a4c7539b82d7d" + +require linux-obmc.inc +require conf/machine/include/fitimage-sign.inc + +# OpenBMC loads in kernel features via other mechanisms so this check +# in the kernel-yocto.bbclass is not required +#KERNEL_DANGLING_FEATURES_WARN_ONLY="1" -- cgit v1.2.3