Merge pull request #4626 from shenki/ppe42-gcc-build-fix-p10
ppe42-gcc: Add build fix
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 5181e27..014c074 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/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/'