Merge pull request #4628 from shenki/everest-xml-url
p10ebmc: Update everest-xml repository
diff --git a/openpower/configs/denali_defconfig b/openpower/configs/denali_defconfig
index d621a7a..fa42d6e 100644
--- a/openpower/configs/denali_defconfig
+++ b/openpower/configs/denali_defconfig
@@ -16,7 +16,7 @@
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.10.108"
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 d5beeb5..323cef2 100644
--- a/openpower/configs/p10ebmc_defconfig
+++ b/openpower/configs/p10ebmc_defconfig
@@ -18,7 +18,7 @@
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.10.108"
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/Config.in b/openpower/package/hostboot-p10/Config.in
index 62404d8..f841e6d 100644
--- a/openpower/package/hostboot-p10/Config.in
+++ b/openpower/package/hostboot-p10/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_P10_VERSION
string
- default "18bc2c6bb35e3b07be5497f348420d6019ce097b" if BR2_HOSTBOOT_P10_LATEST_VERSION
+ default "ad376eaf1ae9963afbbb20ea3aa8a0a935c6887b" if BR2_HOSTBOOT_P10_LATEST_VERSION
default BR2_HOSTBOOT_P10_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_P10_CUSTOM_VERSION
diff --git a/openpower/package/ppe42-gcc/0001-reload-Change-to-type-of-x_spill_indirect_levels.patch b/openpower/package/ppe42-gcc/0001-reload-Change-to-type-of-x_spill_indirect_levels.patch
new file mode 100644
index 0000000..53257b7
--- /dev/null
+++ b/openpower/package/ppe42-gcc/0001-reload-Change-to-type-of-x_spill_indirect_levels.patch
@@ -0,0 +1,43 @@
+From 492c1398f248f579d6e186ce6787bb90bee33e26 Mon Sep 17 00:00:00 2001
+From: Joel Stanley <joel@jms.id.au>
+Date: Thu, 24 Mar 2022 12:16:54 +1030
+Subject: [PATCH] reload: Change to type of x_spill_indirect_levels
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When building with GCC 11, which defaults to C++17:
+
+../.././gcc/reload1.c: In function ‘void init_reload()’:
+../.././gcc/reload1.c:89:24: error: use of an operand of type ‘bool’ in ‘operator++’ is forbidden in C++17
+ 89 | (this_target_reload->x_spill_indirect_levels)
+ | ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~
+../.././gcc/reload1.c:444:7: note: in expansion of macro ‘spill_indirect_levels’
+ 444 | spill_indirect_levels++;
+ | ^~~~~~~~~~~~~~~~~~~~~
+
+Make the same fix as was made upstream:
+
+ https://github.com/gcc-mirror/gcc/commit/d57c99458933a21fdf94f508191f145ad8d5ec58
+
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ gcc/reload.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/reload.h b/gcc/reload.h
+index 65fa29c2bd26..e3ec30ac858c 100644
+--- a/gcc/reload.h
++++ b/gcc/reload.h
+@@ -166,7 +166,7 @@ struct target_reload {
+ value indicates the level of indirect addressing supported, e.g., two
+ means that (MEM (MEM (REG n))) is also valid if (REG n) does not get
+ a hard register. */
+- bool x_spill_indirect_levels;
++ unsigned char x_spill_indirect_levels;
+
+ /* True if caller-save has been reinitialized. */
+ bool x_caller_save_initialized_p;
+--
+2.35.1
+
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 04e1052..dd2cd13 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -37,11 +37,9 @@
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
diff --git a/openpower/scripts/firmware-whitelist b/openpower/scripts/firmware-whitelist
index 3ca6e7b..b8a95f0 100755
--- a/openpower/scripts/firmware-whitelist
+++ b/openpower/scripts/firmware-whitelist
@@ -6,7 +6,7 @@
# slash is required.
whitelist=( 'acenic/'
'bnx2/'
- 'bnx2x/bnx2x-e2-7.13.11.0.fw'
+ 'bnx2x/bnx2x-e2-7.13.15.0.fw'
'cxgb4/t4fw-1.16.63.0.bin'
'cxgb4/t4fw.bin'
'cxgb3/'