diff --git a/openpower/configs/witherspoon-redbud_defconfig b/openpower/configs/witherspoon-redbud_defconfig
index 770fa09..7531a7b 100644
--- a/openpower/configs/witherspoon-redbud_defconfig
+++ b/openpower/configs/witherspoon-redbud_defconfig
@@ -42,7 +42,7 @@
 BR2_OPENPOWER_POWER9=y
 BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="896d1e14fce4a5b54b0052236c8220a64115cfc7"
+BR2_OPENPOWER_MACHINE_XML_VERSION="5575e7e1defd6441b885eb7169fc6d1276035e3c"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
 BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
 BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
diff --git a/openpower/configs/witherspoon-sequoia_defconfig b/openpower/configs/witherspoon-sequoia_defconfig
index e61090d..72911eb 100644
--- a/openpower/configs/witherspoon-sequoia_defconfig
+++ b/openpower/configs/witherspoon-sequoia_defconfig
@@ -41,7 +41,7 @@
 BR2_OPENPOWER_POWER9=y
 BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="896d1e14fce4a5b54b0052236c8220a64115cfc7"
+BR2_OPENPOWER_MACHINE_XML_VERSION="5575e7e1defd6441b885eb7169fc6d1276035e3c"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
 BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
 BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index b0641ef..8badfb4 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -41,7 +41,7 @@
 BR2_OPENPOWER_POWER9=y
 BR2_HOSTBOOT_CONFIG_FILE="zaius.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="zaius-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="a3dc0675984eeb03b6688b056263f45f9fc4a3e9"
+BR2_OPENPOWER_MACHINE_XML_VERSION="3efd78f7eca10acb5627d3e8aa35a78b76ec35a0"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="zaius.xml"
 BR2_OPENPOWER_SYSTEM_XML_FILENAME="ZAIUS_hb.system.xml"
 BR2_OPENPOWER_MRW_XML_FILENAME="ZAIUS_hb.mrw.xml"
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index a84e4f7..b8b1e10 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 695bd891343faf1f0ef85fe53148590e58239efd
-HOSTBOOT_VERSION_BRANCH_MASTER ?= 9ecbdfd70311bd7074ce341201779791a14e381c
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 70f4568bc783303c6310aaaca725b82e339691d5
 
 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/p8-pore-binutils/p8-pore-binutils.mk b/openpower/package/p8-pore-binutils/p8-pore-binutils.mk
index a94d8c6..880dc09 100644
--- a/openpower/package/p8-pore-binutils/p8-pore-binutils.mk
+++ b/openpower/package/p8-pore-binutils/p8-pore-binutils.mk
@@ -19,7 +19,7 @@
                     --exec-prefix=$(P8_PORE_BINUTILS_BIN) \
                     --target=pore-elf64 && \
         make configure-host && \
-        make LDFLAGS=-all-static
+        make CFLAGS=-Wno-error LDFLAGS=-all-static
 endef
 
 define HOST_P8_PORE_BINUTILS_INSTALL_CMDS