From 1d982ee29626b9516f836342d59237b2fee5ba38 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 15 Mar 2023 13:33:16 +1030 Subject: [PATCH 1/3] loadkeys: Sync with kbd package Loadkeys is a copy of kbd to reduce the filesystem size. It doesn't build with GCC 11, so update to the latest kdb version. Signed-off-by: Joel Stanley --- openpower/package/loadkeys/loadkeys.hash | 4 +++- openpower/package/loadkeys/loadkeys.mk | 14 +++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/openpower/package/loadkeys/loadkeys.hash b/openpower/package/loadkeys/loadkeys.hash index 39a4cddb6e..63f7286d30 100644 --- a/openpower/package/loadkeys/loadkeys.hash +++ b/openpower/package/loadkeys/loadkeys.hash @@ -1,2 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kbd/sha256sums.asc -sha256 7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e kbd-2.0.3.tar.xz +sha256 ccdf452387a6380973d2927363e9cbb939fa2068915a6f937ff9d24522024683 kbd-2.5.1.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 5a16340fe773f422144b436df90319114a2884933c56e9be6fad642e59be5e1f CREDITS diff --git a/openpower/package/loadkeys/loadkeys.mk b/openpower/package/loadkeys/loadkeys.mk index 0a05026d43..03372fca6b 100644 --- a/openpower/package/loadkeys/loadkeys.mk +++ b/openpower/package/loadkeys/loadkeys.mk @@ -4,13 +4,17 @@ # ################################################################################ -LOADKEYS_VERSION = 2.0.3 +LOADKEYS_VERSION = 2.5.1 LOADKEYS_SOURCE = kbd-$(LOADKEYS_VERSION).tar.xz LOADKEYS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd -LOADKEYS_CONF_OPTS = --disable-vlock -LOADKEYS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) -LOADKEYS_LICENSE = GPLv2+ -LOADKEYS_LICENSE_FILES = COPYING +LOADKEYS_CONF_OPTS = \ + --disable-vlock \ + --disable-tests +LOADKEYS_DEPENDENCIES = \ + $(TARGET_NLS_DEPENDENCIES) \ + host-pkgconf +LOADKEYS_LICENSE = GPL-2.0+ +LOADKEYS_LICENSE_FILES = COPYING CREDITS LOADKEYS_INSTALL_STAGING = NO LOADKEYS_INSTALL_TARGET = YES From d6771427cf22e1d573152c746c779d27e04baf7f Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 15 Mar 2023 08:37:04 +1030 Subject: [PATCH 2/3] buildroot: Move to 2023.02 release Building for power8 is now the default for ppc64le. GCC 8 is no longer available so drop the option to a void an error with legacy config. GCC 10 will now be used. Signed-off-by: Joel Stanley --- .gitmodules | 2 +- buildroot | 2 +- openpower/configs/blackbird_defconfig | 2 -- openpower/configs/mihawk_defconfig | 2 -- openpower/configs/mowgli_defconfig | 2 -- openpower/configs/nicole_defconfig | 2 -- openpower/configs/opal_defconfig | 1 - openpower/configs/p9dsu_defconfig | 2 -- openpower/configs/romulus_defconfig | 2 -- openpower/configs/swift_defconfig | 2 -- openpower/configs/witherspoon_defconfig | 2 -- openpower/configs/zaius_defconfig | 2 -- openpower/configs/zz_defconfig | 1 - 13 files changed, 2 insertions(+), 22 deletions(-) diff --git a/.gitmodules b/.gitmodules index 27c579253a..6f26cb3f1c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "buildroot"] path = buildroot - branch = 2021.02-op-build + branch = 2023.02-op-build url = https://github.com/open-power/buildroot diff --git a/buildroot b/buildroot index 2b611ab062..821fd62c35 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 2b611ab062a57fdc287be80f8e9d28d64ceb1b52 +Subproject commit 821fd62c355c52485f6eb7e0a07fdb1a6c9e90a7 diff --git a/openpower/configs/blackbird_defconfig b/openpower/configs/blackbird_defconfig index 2d70d26ef4..07cf43092e 100644 --- a/openpower/configs/blackbird_defconfig +++ b/openpower/configs/blackbird_defconfig @@ -1,9 +1,7 @@ BR2_powerpc64le=y -BR2_powerpc_power8=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/blackbird-patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" -BR2_GCC_VERSION_8_X=y BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="skiroot" diff --git a/openpower/configs/mihawk_defconfig b/openpower/configs/mihawk_defconfig index cdccd982f9..8c013006bf 100644 --- a/openpower/configs/mihawk_defconfig +++ b/openpower/configs/mihawk_defconfig @@ -1,9 +1,7 @@ BR2_powerpc64le=y -BR2_powerpc_power8=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/mihawk-patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" -BR2_GCC_VERSION_8_X=y BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="skiroot" diff --git a/openpower/configs/mowgli_defconfig b/openpower/configs/mowgli_defconfig index 21e4147df4..111ae44d5a 100644 --- a/openpower/configs/mowgli_defconfig +++ b/openpower/configs/mowgli_defconfig @@ -1,8 +1,6 @@ BR2_powerpc64le=y -BR2_powerpc_power8=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" -BR2_GCC_VERSION_8_X=y BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="skiroot" diff --git a/openpower/configs/nicole_defconfig b/openpower/configs/nicole_defconfig index 8b1b9c2ce8..a9fdc54034 100644 --- a/openpower/configs/nicole_defconfig +++ b/openpower/configs/nicole_defconfig @@ -1,8 +1,6 @@ BR2_powerpc64le=y -BR2_powerpc_power8=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" -BR2_GCC_VERSION_8_X=y BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="skiroot" diff --git a/openpower/configs/opal_defconfig b/openpower/configs/opal_defconfig index 18fd797a63..7871c7d4c1 100644 --- a/openpower/configs/opal_defconfig +++ b/openpower/configs/opal_defconfig @@ -1,5 +1,4 @@ BR2_powerpc64le=y -BR2_powerpc_power8=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig index 7e15dbe596..e7911f7665 100644 --- a/openpower/configs/p9dsu_defconfig +++ b/openpower/configs/p9dsu_defconfig @@ -1,8 +1,6 @@ BR2_powerpc64le=y -BR2_powerpc_power8=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" -BR2_GCC_VERSION_8_X=y BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="skiroot" diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig index c4db9f6695..2a911cd3f1 100644 --- a/openpower/configs/romulus_defconfig +++ b/openpower/configs/romulus_defconfig @@ -1,8 +1,6 @@ BR2_powerpc64le=y -BR2_powerpc_power8=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" -BR2_GCC_VERSION_8_X=y BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="skiroot" diff --git a/openpower/configs/swift_defconfig b/openpower/configs/swift_defconfig index 7982db3522..6cf1ca4ad0 100644 --- a/openpower/configs/swift_defconfig +++ b/openpower/configs/swift_defconfig @@ -1,8 +1,6 @@ BR2_powerpc64le=y -BR2_powerpc_power8=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" -BR2_GCC_VERSION_8_X=y BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="skiroot" diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig index dfb85cd11e..bfa8548f40 100644 --- a/openpower/configs/witherspoon_defconfig +++ b/openpower/configs/witherspoon_defconfig @@ -1,8 +1,6 @@ BR2_powerpc64le=y -BR2_powerpc_power8=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" -BR2_GCC_VERSION_8_X=y BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="skiroot" diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig index 65e641431a..995654f89e 100644 --- a/openpower/configs/zaius_defconfig +++ b/openpower/configs/zaius_defconfig @@ -1,8 +1,6 @@ BR2_powerpc64le=y -BR2_powerpc_power8=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" -BR2_GCC_VERSION_8_X=y BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="skiroot" diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig index d7a42daa1e..0b6e3cb838 100644 --- a/openpower/configs/zz_defconfig +++ b/openpower/configs/zz_defconfig @@ -1,5 +1,4 @@ BR2_powerpc64le=y -BR2_powerpc_power8=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" From a0b660a193a65dc0f1286c249c775d909863210e Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 15 Mar 2023 08:48:29 +1030 Subject: [PATCH 3/3] linux: Move to v5.10.174 Update to the latest v5.10 kernel for security and bug fixes. Signed-off-by: Joel Stanley --- openpower/configs/blackbird_defconfig | 2 +- openpower/configs/mihawk_defconfig | 2 +- openpower/configs/mowgli_defconfig | 2 +- openpower/configs/nicole_defconfig | 2 +- openpower/configs/opal_defconfig | 2 +- openpower/configs/p9dsu_defconfig | 2 +- openpower/configs/romulus_defconfig | 2 +- openpower/configs/swift_defconfig | 2 +- openpower/configs/witherspoon_defconfig | 2 +- openpower/configs/zaius_defconfig | 2 +- openpower/configs/zz_defconfig | 2 +- .../linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch | 4 ++-- openpower/linux/0002-Release-OpenPower-kernel.patch | 4 ++-- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/openpower/configs/blackbird_defconfig b/openpower/configs/blackbird_defconfig index 07cf43092e..a410b8ba8b 100644 --- a/openpower/configs/blackbird_defconfig +++ b/openpower/configs/blackbird_defconfig @@ -16,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/mihawk_defconfig b/openpower/configs/mihawk_defconfig index 8c013006bf..7af528e26e 100644 --- a/openpower/configs/mihawk_defconfig +++ b/openpower/configs/mihawk_defconfig @@ -16,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/mowgli_defconfig b/openpower/configs/mowgli_defconfig index 111ae44d5a..f8fc574d07 100644 --- a/openpower/configs/mowgli_defconfig +++ b/openpower/configs/mowgli_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/nicole_defconfig b/openpower/configs/nicole_defconfig index a9fdc54034..d3b76f4b4c 100644 --- a/openpower/configs/nicole_defconfig +++ b/openpower/configs/nicole_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/opal_defconfig b/openpower/configs/opal_defconfig index 7871c7d4c1..7ef2e7bf11 100644 --- a/openpower/configs/opal_defconfig +++ b/openpower/configs/opal_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig index e7911f7665..7d4dc5b93b 100644 --- a/openpower/configs/p9dsu_defconfig +++ b/openpower/configs/p9dsu_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig index 2a911cd3f1..53ee648af2 100644 --- a/openpower/configs/romulus_defconfig +++ b/openpower/configs/romulus_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/swift_defconfig b/openpower/configs/swift_defconfig index 6cf1ca4ad0..b472a0c398 100644 --- a/openpower/configs/swift_defconfig +++ b/openpower/configs/swift_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig index bfa8548f40..185ba1be5f 100644 --- a/openpower/configs/witherspoon_defconfig +++ b/openpower/configs/witherspoon_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig index 995654f89e..5255c887ba 100644 --- a/openpower/configs/zaius_defconfig +++ b/openpower/configs/zaius_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig index 0b6e3cb838..5290afc56c 100644 --- a/openpower/configs/zz_defconfig +++ b/openpower/configs/zz_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch index 9380398193..24f3862ec2 100644 --- a/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch +++ b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch @@ -14,10 +14,10 @@ Signed-off-by: Joel Stanley 1 file changed, 3 insertions(+) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index a8d97e23f601..308ab396bd88 100644 +index 473b0b64dd57..ca0c642ce935 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -793,6 +793,9 @@ void xhci_shutdown(struct usb_hcd *hcd) +@@ -812,6 +812,9 @@ void xhci_shutdown(struct usb_hcd *hcd) xhci_dbg_trace(xhci, trace_xhci_dbg_init, "xhci_shutdown completed - status = %x", readl(&xhci->op_regs->status)); diff --git a/openpower/linux/0002-Release-OpenPower-kernel.patch b/openpower/linux/0002-Release-OpenPower-kernel.patch index d780e5980b..a592243a8d 100644 --- a/openpower/linux/0002-Release-OpenPower-kernel.patch +++ b/openpower/linux/0002-Release-OpenPower-kernel.patch @@ -9,13 +9,13 @@ Signed-off-by: Joel Stanley 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 695f8e739a91..f2280292b96e 100644 +index 92accf2ddc08..18dcc81a67e4 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION = 5 PATCHLEVEL = 10 - SUBLEVEL = 108 + SUBLEVEL = 174 -EXTRAVERSION = +EXTRAVERSION = -openpower1 NAME = Dare mighty things