diff --git a/.gitmodules b/.gitmodules index 27c579253a..db0c71c218 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "buildroot"] path = buildroot - branch = 2021.02-op-build + branch = 2022.02-op-build url = https://github.com/open-power/buildroot diff --git a/buildroot b/buildroot index 2c7a998479..65d9213f21 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 2c7a9984796b03506a1a2b1ccf3f76fc85733c17 +Subproject commit 65d9213f214d7f6810e61f4ec85e9893b717b40b diff --git a/openpower/configs/blackbird_defconfig b/openpower/configs/blackbird_defconfig index 1d5532df83..f60365c439 100644 --- a/openpower/configs/blackbird_defconfig +++ b/openpower/configs/blackbird_defconfig @@ -1,9 +1,8 @@ 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_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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" @@ -18,7 +17,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.4.68" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28" 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/denali_defconfig b/openpower/configs/denali_defconfig index d621a7a477..33e48e7e8d 100644 --- a/openpower/configs/denali_defconfig +++ b/openpower/configs/denali_defconfig @@ -1,6 +1,6 @@ BR2_powerpc64le=y BR2_powerpc_power8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_BINUTILS_VERSION_2_32_X=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" @@ -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.50" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28" 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 ec4096730e..54df376364 100644 --- a/openpower/configs/mihawk_defconfig +++ b/openpower/configs/mihawk_defconfig @@ -1,9 +1,8 @@ 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_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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" @@ -18,7 +17,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.4.68" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28" 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 3be510382e..471c9bda6b 100644 --- a/openpower/configs/mowgli_defconfig +++ b/openpower/configs/mowgli_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y BR2_powerpc_power8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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" @@ -17,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.4.68" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28" 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 c57f8075f8..16e955d9a6 100644 --- a/openpower/configs/nicole_defconfig +++ b/openpower/configs/nicole_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y BR2_powerpc_power8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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" @@ -16,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.4.68" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28" 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 3fa62fba33..dc040c055b 100644 --- a/openpower/configs/opal_defconfig +++ b/openpower/configs/opal_defconfig @@ -1,6 +1,6 @@ BR2_powerpc64le=y BR2_powerpc_power8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" BR2_TARGET_GENERIC_HOSTNAME="skiroot" @@ -13,7 +13,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.4.68" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28" 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/p10ebmc_defconfig b/openpower/configs/p10ebmc_defconfig index 6a0c7506e1..26763c84d5 100644 --- a/openpower/configs/p10ebmc_defconfig +++ b/openpower/configs/p10ebmc_defconfig @@ -1,9 +1,8 @@ BR2_powerpc64le=y BR2_powerpc_power8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_BINUTILS_VERSION_2_32_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y ++BR2_BINUTILS_VERSION_2_32_X=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" @@ -18,7 +17,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.50" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28" 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 6a525ee288..ecdc870cee 100644 --- a/openpower/configs/p9dsu_defconfig +++ b/openpower/configs/p9dsu_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y BR2_powerpc_power8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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" @@ -17,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.4.68" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28" 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 70b5cca2d7..9b1045c0b0 100644 --- a/openpower/configs/romulus_defconfig +++ b/openpower/configs/romulus_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y BR2_powerpc_power8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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" @@ -17,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.4.68" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28" 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 8b6e7fcf05..5154fec4cc 100644 --- a/openpower/configs/swift_defconfig +++ b/openpower/configs/swift_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y BR2_powerpc_power8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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" @@ -17,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.4.68" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28" 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 5066debd07..554a8e0402 100644 --- a/openpower/configs/witherspoon_defconfig +++ b/openpower/configs/witherspoon_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y BR2_powerpc_power8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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" @@ -17,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.4.68" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28" 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 aa8a03d32e..143df96cf8 100644 --- a/openpower/configs/zaius_defconfig +++ b/openpower/configs/zaius_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y BR2_powerpc_power8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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" @@ -17,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.4.68" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28" 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 3195c7e151..938e7ba67a 100644 --- a/openpower/configs/zz_defconfig +++ b/openpower/configs/zz_defconfig @@ -1,6 +1,6 @@ BR2_powerpc64le=y BR2_powerpc_power8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" BR2_TARGET_GENERIC_HOSTNAME="skiroot" @@ -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.4.68" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28" 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/package/hostboot-p10/0001-util-Fix-unique_ptr-with-GCC-9.patch b/openpower/package/hostboot-p10/0001-util-Fix-unique_ptr-with-GCC-9.patch new file mode 100644 index 0000000000..1f24926199 --- /dev/null +++ b/openpower/package/hostboot-p10/0001-util-Fix-unique_ptr-with-GCC-9.patch @@ -0,0 +1,27 @@ +From fd9ca28d5fd2a4428add2e4c04b3514d5d1dae3f Mon Sep 17 00:00:00 2001 +From: Joel Stanley +Date: Thu, 17 Mar 2022 12:46:15 +1030 +Subject: [PATCH 1/4] util: Fix unique_ptr with GCC 9 + +Change-Id: I08ead07fe5b587b43e06410b31dbfdba54d9a442 +Signed-off-by: Joel Stanley +--- + src/include/util/impl/unique_ptr.H | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/util/impl/unique_ptr.H b/src/include/util/impl/unique_ptr.H +index 689794330196..5c486526b81b 100644 +--- a/src/include/util/impl/unique_ptr.H ++++ b/src/include/util/impl/unique_ptr.H +@@ -402,7 +402,7 @@ namespace std + * @return Value of T::operator[](i) + */ + template +- typename enable_if::value, decltype(declval()[declval()])>::type ++ typename enable_if::value, decltype(declval()[declval()])>::type& + operator[](const Index i) + { + return iv_ptr[i]; +-- +2.35.1 + diff --git a/openpower/package/hostboot-p10/0002-utilmisc-Fix-build-error-with-GCC-10.patch b/openpower/package/hostboot-p10/0002-utilmisc-Fix-build-error-with-GCC-10.patch new file mode 100644 index 0000000000..47d140d6d8 --- /dev/null +++ b/openpower/package/hostboot-p10/0002-utilmisc-Fix-build-error-with-GCC-10.patch @@ -0,0 +1,96 @@ +From 6fbd93ed7307402027aa336fc6dc512022e7baeb Mon Sep 17 00:00:00 2001 +From: Joel Stanley +Date: Thu, 17 Mar 2022 14:00:52 +1030 +Subject: [PATCH 2/4] utilmisc: Fix build error with GCC 10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From when this was introduced (2737de709eae) it wasn't commented why it +was done this way. Clean it up. + +utilmisc.C:31:6: error: ‘bool Util::isSimics()’ specifies less restrictive attribute than its target ‘bool Util::__isSimicsRunning()’: ‘nothrow’ [-Werror=missing-attributes] + 31 | bool isSimics() __attribute__((alias("__isSimicsRunning"))); + | ^~~~~~~~ +utilmisc.C:34:6: note: ‘bool Util::isSimics()’ target declared here + 34 | bool __isSimicsRunning() + | ^~~~~~~~~~~~~~~~~ +utilmisc.C:48:6: error: ‘bool Util::isQmeModelEnabled()’ specifies less restrictive attribute than its target ‘bool Util::__isQmeEnabled()’: ‘nothrow’ [-Werror=missing-attributes] + 48 | bool isQmeModelEnabled() __attribute__((alias("__isQmeEnabled"))); + | ^~~~~~~~~~~~~~~~~ +utilmisc.C:51:6: note: ‘bool Util::isQmeModelEnabled()’ target declared here + 51 | bool __isQmeEnabled() + | ^~~~~~~~~~~~~~ + +Change-Id: Id5291022b09dca6789175d69e54a30d55f1bde13 +Signed-off-by: Joel Stanley +--- + src/lib/utilmisc.C | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/src/lib/utilmisc.C b/src/lib/utilmisc.C +index b3ca1ac04c53..85665c824487 100644 +--- a/src/lib/utilmisc.C ++++ b/src/lib/utilmisc.C +@@ -28,8 +28,7 @@ + namespace Util + { + +-bool isSimics() __attribute__((alias("__isSimicsRunning"))); +-extern "C" bool __isSimicsRunning() NEVER_INLINE; ++bool __isSimicsRunning() NEVER_INLINE; + + bool __isSimicsRunning() + { +@@ -40,12 +39,11 @@ bool __isSimicsRunning() + + bool isSimicsRunning() + { +- static bool simics = isSimics(); ++ static bool simics = __isSimicsRunning(); + return simics; + } + + +-bool isQmeModelEnabled() __attribute__((alias("__isQmeEnabled"))); + extern "C" bool __isQmeEnabled() NEVER_INLINE; + + bool __isQmeEnabled() +@@ -58,7 +56,7 @@ bool __isQmeEnabled() + bool requiresSecondaryCoreWorkaround() + { + static const auto required = +- isSimicsRunning() && !isQmeModelEnabled(); ++ isSimicsRunning() && !__isQmeEnabled(); + return required; + } + +@@ -86,10 +84,14 @@ void setIsConsoleStarted() + g_isConsoleStarted = true; + } + +-bool isMultiprocSupported() __attribute__((alias("__isMultiprocSupported"))); + extern "C" bool __isMultiprocSupported() NEVER_INLINE; + +-bool __isMultiprocSupported() ++bool __isMulitprocSupported() ++{ ++ return MAGIC_INST_CHECK_FEATURE(MAGIC_FEATURE__MULTIPROC); ++} ++ ++bool isMultiprocSupported() + { + bool multiprocSupport = true; + +@@ -98,7 +100,7 @@ bool __isMultiprocSupported() + #else + if (isSimicsRunning()) + { +- multiprocSupport = MAGIC_INST_CHECK_FEATURE(MAGIC_FEATURE__MULTIPROC); ++ multiprocSupport = __isMulitprocSupported(); + } + #endif + +-- +2.35.1 + diff --git a/openpower/package/hostboot-p10/0003-cflags-Work-around-errors-with-GCC-9.patch b/openpower/package/hostboot-p10/0003-cflags-Work-around-errors-with-GCC-9.patch new file mode 100644 index 0000000000..b08e9ae4fb --- /dev/null +++ b/openpower/package/hostboot-p10/0003-cflags-Work-around-errors-with-GCC-9.patch @@ -0,0 +1,32 @@ +From b2d596f1116dfb13f0f980b5a85aa92fe6a795dd Mon Sep 17 00:00:00 2001 +From: Joel Stanley +Date: Thu, 17 Mar 2022 12:52:49 +1030 +Subject: [PATCH 3/4] cflags: Work around errors with GCC 9 + +Change-Id: Ib0542c1fc53a5f1480981158eed10f9a46029446 +Signed-off-by: Joel Stanley +--- + src/build/mkrules/cflags.env.mk | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/build/mkrules/cflags.env.mk b/src/build/mkrules/cflags.env.mk +index 9b1d30266e30..2bd5ca9a6640 100644 +--- a/src/build/mkrules/cflags.env.mk ++++ b/src/build/mkrules/cflags.env.mk +@@ -45,10 +45,11 @@ CFLAGS += -include config.h + COMMONFLAGS += $(OPT_LEVEL) -nostdlib + CFLAGS += $(COMMONFLAGS) -mcpu=power7 -nostdinc -g -mno-vsx -mno-altivec\ + -Werror -Wall -mtraceback=no -pipe -mabi=elfv1 \ +- -ffunction-sections -fdata-sections -ffreestanding -mbig-endian ++ -ffunction-sections -fdata-sections -ffreestanding -mbig-endian \ ++ -Wno-address-of-packed-member + ASMFLAGS += $(COMMONFLAGS) -mcpu=power7 -mbig-endian -ffreestanding -mabi=elfv1 + CXXFLAGS += $(CFLAGS) -nostdinc++ -fno-rtti -fno-exceptions -Werror -Wall \ +- -fuse-cxa-atexit -std=gnu++14 ++ -fuse-cxa-atexit -std=gnu++14 -fpermissive + LDFLAGS += --nostdlib --sort-common -EB $(COMMONFLAGS) + + INCFLAGS = $(addprefix -I, $(INCDIR) ) +-- +2.35.1 + diff --git a/openpower/package/hostboot-p10/0004-cflags-Disable-stack-protector.patch b/openpower/package/hostboot-p10/0004-cflags-Disable-stack-protector.patch new file mode 100644 index 0000000000..028104c1d4 --- /dev/null +++ b/openpower/package/hostboot-p10/0004-cflags-Disable-stack-protector.patch @@ -0,0 +1,32 @@ +From 953f2631d1aadbb4f8eca50c4420a80778cfe4ed Mon Sep 17 00:00:00 2001 +From: Joel Stanley +Date: Thu, 17 Mar 2022 14:34:15 +1030 +Subject: [PATCH 4/4] cflags: Disable stack protector + + powerpc64le-buildroot-linux-gnu-ld: ../obj/core/bootloader.o: in function `Bootloader::verifyComponentId(void const*, char const*)': + src/bootloader/bootloader.C:279: undefined reference to `__stack_chk_fail' + +We should provide an implementation of __stack_chk_fail. + +Change-Id: I2af514278b0eaa87a0b7f17fa1908d2b26adf3c4 +Signed-off-by: Joel Stanley +--- + src/build/mkrules/cflags.env.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/build/mkrules/cflags.env.mk b/src/build/mkrules/cflags.env.mk +index 2bd5ca9a6640..b30c82d65255 100644 +--- a/src/build/mkrules/cflags.env.mk ++++ b/src/build/mkrules/cflags.env.mk +@@ -46,7 +46,7 @@ COMMONFLAGS += $(OPT_LEVEL) -nostdlib + CFLAGS += $(COMMONFLAGS) -mcpu=power7 -nostdinc -g -mno-vsx -mno-altivec\ + -Werror -Wall -mtraceback=no -pipe -mabi=elfv1 \ + -ffunction-sections -fdata-sections -ffreestanding -mbig-endian \ +- -Wno-address-of-packed-member ++ -Wno-address-of-packed-member -fno-stack-protector + ASMFLAGS += $(COMMONFLAGS) -mcpu=power7 -mbig-endian -ffreestanding -mabi=elfv1 + CXXFLAGS += $(CFLAGS) -nostdinc++ -fno-rtti -fno-exceptions -Werror -Wall \ + -fuse-cxa-atexit -std=gnu++14 -fpermissive +-- +2.35.1 + diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in index 04e10527c3..dd2cd134b4 100644 --- a/openpower/package/skiboot/Config.in +++ b/openpower/package/skiboot/Config.in @@ -37,11 +37,9 @@ config BR2_SKIBOOT_VERSION config BR2_SKIBOOT_CUSTOM_GIT bool "Custom git repository" - default y config BR2_SKIBOOT_CUSTOM_REPO_URL string "URL of custom repository" - default "git@github.com:open-power/skiboot.git" depends on BR2_SKIBOOT_CUSTOM_GIT config BR2_SKIBOOT_DEVICETREE