From 6d539b96c484e8dbaeae9170e9bb1c052270433e Mon Sep 17 00:00:00 2001 From: Mike Garrett Date: Fri, 27 Aug 2021 16:50:20 -0500 Subject: meta-hpe: Update Linux kernel to 5.10 from 5.7 Linux kernel and DTS updates Signed-off-by: Mike Garrett Change-Id: I365e1b6d1d060c131c9d7a1b0f76ef9256f0e73f --- .../meta-gxp/recipes-kernel/linux/linux-obmc.inc | 1 + .../recipes-kernel/linux/linux-obmc/defconfig | 35 +++++++++++++++------- .../recipes-kernel/linux/linux-obmc_5.10.bb | 10 +++++++ .../recipes-kernel/linux/linux-obmc_5.7.bb | 9 ------ 4 files changed, 36 insertions(+), 19 deletions(-) create mode 100644 meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.10.bb delete mode 100644 meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.7.bb (limited to 'meta-hpe/meta-gxp') 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 5c172b1c4..5d79797f7 100644 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc +++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc @@ -21,3 +21,4 @@ require recipes-kernel/linux/linux-yocto.inc # From 4.16+ the COPYING file changed LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + 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 1507daf83..cdd03e3f7 100644 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig +++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig @@ -26,8 +26,6 @@ CONFIG_ARCH_HPE=y CONFIG_ARCH_HPE_GXP=y CONFIG_SECCOMP=y # CONFIG_ATAGS is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 # CONFIG_SUSPEND is not set CONFIG_ARM_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM=y @@ -37,8 +35,6 @@ CONFIG_CRYPTO_AES_ARM=y CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_POLY1305_ARM=y CONFIG_JUMP_LABEL=y -# CONFIG_STRICT_KERNEL_RWX is not set -# CONFIG_BLK_DEBUG_FS is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_KSM=y CONFIG_CLEANCACHE=y @@ -50,12 +46,22 @@ CONFIG_UNIX_DIAG=y CONFIG_XFRM_USER=y CONFIG_XFRM_STATISTICS=y CONFIG_INET=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y # CONFIG_IPV6_SIT is not set +CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_BPFILTER=y CONFIG_VLAN_8021Q=y CONFIG_NETLINK_DIAG=y +CONFIG_NET_NCSI=y # CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y @@ -114,7 +120,7 @@ CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set -CONFIG_UMAC=y +CONFIG_GXP_UMAC=y # CONFIG_USB_NET_DRIVERS is not set # CONFIG_WLAN is not set # CONFIG_INPUT_LEDS is not set @@ -140,16 +146,20 @@ CONFIG_IPMI_DEVICE_INTERFACE=y CONFIG_IPMI_SI=y CONFIG_IPMI_SSIF=y CONFIG_HPE_KCS_IPMI_BMC=y +CONFIG_IPMB_DEVICE_INTERFACE=y CONFIG_HW_RANDOM_TIMERIOMEM=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_GXP=y CONFIG_I2C_SLAVE=y CONFIG_I2C_SLAVE_EEPROM=y -CONFIG_I2C_SLAVE_MQUEUE=y CONFIG_SPI=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GXP_XREG=y CONFIG_GPIO_GXP=y +CONFIG_SENSORS_PECI_CPUTEMP=y +CONFIG_SENSORS_PECI_DIMMTEMP=y +CONFIG_SENSORS_SBTSI=y CONFIG_SENSORS_EMC1403=y CONFIG_SENSORS_GXP_FAN_CTRL=y CONFIG_SENSORS_GXP_CORETEMP=y @@ -205,12 +215,17 @@ CONFIG_HPE_GXP_XREG=y CONFIG_HPE_GXP_FN2=y CONFIG_HPE_GXP_CSM=y CONFIG_HPE_GXP_SROM=y +CONFIG_HPE_GXP_CHIF=y CONFIG_PECI=y CONFIG_PECI_CHARDEV=y +CONFIG_PECI_GXP=y CONFIG_FANOTIFY=y CONFIG_AUTOFS_FS=y CONFIG_OVERLAY_FS=y CONFIG_OVERLAY_FS_REDIRECT_DIR=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_UTF8=y +CONFIG_EXFAT_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_JFFS2_FS=y @@ -235,6 +250,7 @@ CONFIG_CRYPTO_ARC4=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_ZSTD=y +CONFIG_CRYPTO_ANSI_CPRNG=y CONFIG_CRYPTO_USER_API_HASH=y # CONFIG_CRYPTO_HW is not set CONFIG_CRC16=y @@ -249,10 +265,9 @@ CONFIG_DEBUG_INFO=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y CONFIG_PANIC_ON_OOPS=y -CONFIG_SCHED_TRACER=y -CONFIG_STACK_TRACER=y CONFIG_FUNCTION_PROFILER=y -CONFIG_TEST_KSTRTOX=y +CONFIG_STACK_TRACER=y +CONFIG_SCHED_TRACER=y CONFIG_STRICT_DEVMEM=y CONFIG_DEBUG_USER=y CONFIG_DEBUG_LL=y @@ -261,4 +276,4 @@ CONFIG_DEBUG_UART_PHYS=0xC00000F0 CONFIG_DEBUG_UART_VIRT=0xF00000F0 CONFIG_DEBUG_UART_8250_SHIFT=0 CONFIG_EARLY_PRINTK=y -CONFIG_UNWINDER_FRAME_POINTER=y +CONFIG_TEST_KSTRTOX=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 new file mode 100644 index 000000000..d0b5407ae --- /dev/null +++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.10.bb @@ -0,0 +1,10 @@ +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.7.bb b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.7.bb deleted file mode 100644 index 0e57afd87..000000000 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.7.bb +++ /dev/null @@ -1,9 +0,0 @@ -KBRANCH ?= "dev-5.7-gxp-openbmc" -LINUX_VERSION ?= "5.7.10" - -SRCREV="1ca49db2b4baf304d29396a603d0308770797a5c" -require linux-obmc.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