Merge pull request #941 from sammj/pb-1.4.2
petitboot: Update to v1.4.2
diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
index 60a1e4e..120833d 100644
--- a/openpower/configs/romulus_defconfig
+++ b/openpower/configs/romulus_defconfig
@@ -58,7 +58,7 @@
BR2_OCC_BIN_FILENAME="occ.bin"
BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="28e96ffaba8b659f48312bdcea35a1403310fba3"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="c9bf78b0556b1d2c2f3a5041d3da7df225227cde"
BR2_PACKAGE_LOADKEYS=y
BR2_ROMULUS_SYSTEM_XML_FILENAME="ROMULUS_hb.system.xml"
BR2_ROMULUS_MRW_XML_FILENAME="ROMULUS_hb.mrw.xml"
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index 0e2f5d0..567dd3f 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -56,7 +56,7 @@
BR2_OCC_BIN_FILENAME="occ.bin"
BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="28e96ffaba8b659f48312bdcea35a1403310fba3"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="c9bf78b0556b1d2c2f3a5041d3da7df225227cde"
BR2_PACKAGE_LOADKEYS=y
BR2_WITHERSPOON_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
BR2_WITHERSPOON_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index f2acc86..13393bf 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -55,7 +55,7 @@
BR2_OCC_BIN_FILENAME="occ.bin"
BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="28e96ffaba8b659f48312bdcea35a1403310fba3"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="c9bf78b0556b1d2c2f3a5041d3da7df225227cde"
BR2_PACKAGE_LOADKEYS=y
BR2_ZAIUS_SYSTEM_XML_FILENAME="ZAIUS_hb.system.xml"
BR2_ZAIUS_MRW_XML_FILENAME="ZAIUS_hb.mrw.xml"
diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig
index a74e63e..1d6c163 100644
--- a/openpower/configs/zz_defconfig
+++ b/openpower/configs/zz_defconfig
@@ -50,7 +50,7 @@
# BR2_PACKAGE_OCC is not set
# BR2_PACKAGE_CAPP_UCODE is not set
BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="28e96ffaba8b659f48312bdcea35a1403310fba3"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="c9bf78b0556b1d2c2f3a5041d3da7df225227cde"
BR2_PACKAGE_LOADKEYS=y
# BR2_PACKAGE_HOST_PPE42_BINUTILS is not set
# BR2_PACKAGE_HOST_PPE42_GCC is not set
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 9639785..a9063c2 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -3,8 +3,8 @@
# hostboot
#
################################################################################
-HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= fe5c556993ce24fae1f70f6be9a071fbd89e616c
-HOSTBOOT_VERSION_BRANCH_MASTER ?= ef935d393c9d17f41b2495d790f489d9c26ec2f6
+HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= a4b7bb77b3c152af89a57f904f323228ad24373d
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 3d2cb936a4709b34c1b43e40051a2787ed5c9836
HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
diff --git a/openpower/package/ppe42-gcc/ppe42-gcc.mk b/openpower/package/ppe42-gcc/ppe42-gcc.mk
index 0a8bc23..ec10e4f 100644
--- a/openpower/package/ppe42-gcc/ppe42-gcc.mk
+++ b/openpower/package/ppe42-gcc/ppe42-gcc.mk
@@ -9,6 +9,7 @@
PPE42_GCC_LICENSE = GPLv3+
PPE42_GCC_DEPENDENCIES = ppe42-binutils
+HOST_PPE42_GCC_DEPENDENCIES = host-ppe42-binutils
PPE42_GCC_DIR = $(STAGING_DIR)/ppe42-binutils
PPE42_GCC_BIN = $(STAGING_DIR)/ppe42-binutils/linux
diff --git a/openpower/package/witherspoon-xml/witherspoon.mk b/openpower/package/witherspoon-xml/witherspoon.mk
index 13c9424..1ff9ae5 100644
--- a/openpower/package/witherspoon-xml/witherspoon.mk
+++ b/openpower/package/witherspoon-xml/witherspoon.mk
@@ -4,7 +4,7 @@
#
################################################################################
-WITHERSPOON_XML_VERSION ?= 065aaa2b06f8e6d940376a1f192cd6ac5aacde7f
+WITHERSPOON_XML_VERSION ?= 1f50af78532bd2b8bd85ff343f3d07fd0286931f
WITHERSPOON_XML_SITE ?= $(call github,open-power,witherspoon-xml,$(WITHERSPOON_XML_VERSION))
WITHERSPOON_XML_LICENSE = Apache-2.0