Merge pull request #903 from stewart-ibm/bump-p9-skiboot
Bump POWER9 skiboot
diff --git a/openpower/configs/hostboot/witherspoon.config b/openpower/configs/hostboot/witherspoon.config
index f19bff7..8777ea9 100755
--- a/openpower/configs/hostboot/witherspoon.config
+++ b/openpower/configs/hostboot/witherspoon.config
@@ -32,8 +32,8 @@
# Disable SBE updates
unset SBE_UPDATE_INDEPENDENT
unset SBE_UPDATE_SEQUENTIAL
-unset SBE_UPDATE_SIMULTANEOUS
-set NO_SBE_UPDATES
+set SBE_UPDATE_SIMULTANEOUS
+unset NO_SBE_UPDATES
unset PCIE_HOTPLUG_CONTROLLER
diff --git a/openpower/configs/hostboot/zaius.config b/openpower/configs/hostboot/zaius.config
index 3a2480f..099e62c 100755
--- a/openpower/configs/hostboot/zaius.config
+++ b/openpower/configs/hostboot/zaius.config
@@ -32,8 +32,8 @@
# Disable SBE updates
unset SBE_UPDATE_INDEPENDENT
unset SBE_UPDATE_SEQUENTIAL
-unset SBE_UPDATE_SIMULTANEOUS
-set NO_SBE_UPDATES
+set SBE_UPDATE_SIMULTANEOUS
+unset NO_SBE_UPDATES
unset PCIE_HOTPLUG_CONTROLLER
diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
index 1ac5c81..40f70aa 100644
--- a/openpower/configs/romulus_defconfig
+++ b/openpower/configs/romulus_defconfig
@@ -1,6 +1,5 @@
BR2_powerpc64le=y
BR2_powerpc_power8=y
-BR2_KERNEL_HEADERS_4_4=y
BR2_GLIBC_VERSION_2_24=y
BR2_BINUTILS_VERSION_2_27_X=y
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/package/garrison-xml/garrison.mk b/openpower/package/garrison-xml/garrison.mk
index a4a5065..51e43e2 100644
--- a/openpower/package/garrison-xml/garrison.mk
+++ b/openpower/package/garrison-xml/garrison.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GARRISON_XML_VERSION ?= 847371f2141e2d4320fa6700ee2dd9b97057831b
+GARRISON_XML_VERSION ?= 3cd6e7ea9287a8c96f9ba710c67baff92e97af2c
GARRISON_XML_SITE ?= $(call github,open-power,garrison-xml,$(GARRISON_XML_VERSION))
GARRISON_XML_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index 597c7e5..72a97dc 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HOSTBOOT_BINARIES_VERSION ?= 940ac33324d6c2498b88ce3881a2e7644e23dc7b
+HOSTBOOT_BINARIES_VERSION ?= 4b440901a7331507f56ca19a96c9203f7e570309
HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
HOSTBOOT_BINARIES_LICENSE = Apache-2.0
HOSTBOOT_BINARIES_LICENSE_FILES = LICENSE
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 9675e20..dd0bc7c 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= fe5c556993ce24fae1f70f6be9a071fbd89e616c
-HOSTBOOT_VERSION_BRANCH_MASTER ?= 74c9defa9de6733109203d0eadb5684891ffe5a0
+HOSTBOOT_VERSION_BRANCH_MASTER ?= a0437b216feaa77f81cfa3738844a0b761a9e99d
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/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 6c695a4..e426961 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -8,7 +8,7 @@
# make doesn't care for quotes in the dependencies.
XML_PACKAGE=$(subst $\",,$(BR2_OPENPOWER_XML_PACKAGE))
-OPENPOWER_PNOR_VERSION ?= 66ac8ba49a036f643bd16c36c62aebd40fccdc92
+OPENPOWER_PNOR_VERSION ?= cf990e357d11d3a379f0d5d097e2e23a320769de
OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
OPENPOWER_PNOR_LICENSE = Apache-2.0
diff --git a/openpower/package/romulus-xml/romulus.mk b/openpower/package/romulus-xml/romulus.mk
index 136ea5f..17154f5 100644
--- a/openpower/package/romulus-xml/romulus.mk
+++ b/openpower/package/romulus-xml/romulus.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ROMULUS_XML_VERSION ?= 3ae36a611bf874299404c377224915952dbb9b15
+ROMULUS_XML_VERSION ?= 5cfad9acd067c4f919ff64b388848cfe8a3fb9b5
ROMULUS_XML_SITE ?= $(call github,open-power,romulus-xml,$(ROMULUS_XML_VERSION))
ROMULUS_XML_LICENSE = Apache-2.0
@@ -41,6 +41,7 @@
--tgt-xml $(MRW_HB_TOOLS)/target_types_merged.xml \
--tgt-xml $(MRW_HB_TOOLS)/target_types_hb.xml \
--tgt-xml $(MRW_HB_TOOLS)/target_types_oppowervm.xml \
+ --tgt-xml $(MRW_HB_TOOLS)/target_types_openpower.xml \
--mrw-xml $(MRW_SCRATCH)/ROMULUS_hb.mrw.xml
cp $(MRW_SCRATCH)/ROMULUS_hb.mrw.xml.updated $(MRW_SCRATCH)/ROMULUS_hb.mrw.xml
@@ -50,9 +51,11 @@
$(MRW_HB_TOOLS)/attribute_types.xml \
$(MRW_HB_TOOLS)/attribute_types_hb.xml \
$(MRW_HB_TOOLS)/attribute_types_oppowervm.xml \
+ $(MRW_HB_TOOLS)/attribute_types_openpower.xml \
$(MRW_HB_TOOLS)/target_types_merged.xml \
$(MRW_HB_TOOLS)/target_types_hb.xml \
$(MRW_HB_TOOLS)/target_types_oppowervm.xml \
+ $(MRW_HB_TOOLS)/target_types_openpower.xml \
$(MRW_SCRATCH)/$(BR2_ROMULUS_MRW_XML_FILENAME) > $(MRW_HB_TOOLS)/temporary_hb.hb.xml;
# creating the targeting binary
diff --git a/openpower/package/zaius-xml/zaius.mk b/openpower/package/zaius-xml/zaius.mk
index 858079a..4693fba 100644
--- a/openpower/package/zaius-xml/zaius.mk
+++ b/openpower/package/zaius-xml/zaius.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ZAIUS_XML_VERSION ?= abfe0a30c5f541ca361e290e36c773f9bac7b55c
+ZAIUS_XML_VERSION ?= c4eb537b2106c17a10fc02337559388f17aa12f6
ZAIUS_XML_SITE ?= $(call github,open-power,zaius-xml,$(ZAIUS_XML_VERSION))
ZAIUS_XML_LICENSE = Apache-2.0