Merge pull request #1702 from stewart-ibm/p9dsu-no-hb-trace
p9dsu: Disable Hostboot CONSOLE_OUTPUT_TRACE
diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
index 445ac96..3212fe7 100644
--- a/openpower/configs/romulus_defconfig
+++ b/openpower/configs/romulus_defconfig
@@ -41,7 +41,7 @@
BR2_OPENPOWER_POWER9=y
BR2_HOSTBOOT_CONFIG_FILE="romulus.config"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="romulus-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="8633e11cd395547f37df3c9d90cc2c7e0bebd194"
+BR2_OPENPOWER_MACHINE_XML_VERSION="7b69b35ed1bce82ec270dcb98ce7c195f7132be3"
BR2_OPENPOWER_MACHINE_XML_FILENAME="romulus.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="ROMULUS_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="ROMULUS_hb.mrw.xml"
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index de1fe84..394859b 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_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="11e6ca068e718765f2e2de42f7967227819a5d14"
+BR2_OPENPOWER_MACHINE_XML_VERSION="d25ba72d544b2878e322421b33a130836619664c"
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/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index e5ea571..4649a40 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 ?= 665c9a18838f155ae32c74c829fd4605bfd8d30a
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 010d6a9a091bfd2eb29e34e381134df4d19b46cc
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/occ/occ.mk b/openpower/package/occ/occ.mk
index 4aaf6c3..b62c961 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -5,7 +5,7 @@
################################################################################
OCC_VERSION_BRANCH_MASTER_P8 ?= 28f2cec690b7f19548ce860a8820f519e6c39a6a
-OCC_VERSION_BRANCH_MASTER ?= d0f8e5fb2c5a2cd78453630e869d74d569cad394
+OCC_VERSION_BRANCH_MASTER ?= 49ea880a77890b05a7b06cdf083122acb7f15a10
OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8))
OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION))
diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk
index 5d507fa..82339be 100644
--- a/openpower/package/sbe/sbe.mk
+++ b/openpower/package/sbe/sbe.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SBE_VERSION ?= e487a02045d4076b512b5247654abe62cf2bcf8a
+SBE_VERSION ?= b6054b3ff39537c7fe2c2af7810df6d090ae11f7
SBE_SITE ?= $(call github,open-power,sbe,$(SBE_VERSION))
SBE_LICENSE = Apache-2.0