Merge pull request #597 from klausk/skiboot_bump
Bump Skiboot-p10 to v6.6-291-gc95c8a78e
diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index c9a1b3d..2f17dba 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -51,12 +51,12 @@
BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
BR2_RAINIER_2U_XML_CUSTOM_GIT=y
BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_2U_XML_VERSION="606809047f5073ed9fab4c1503180fec31136b82"
+BR2_RAINIER_2U_XML_VERSION="6267cabb8f02e7b5af84aecef84c5f0b50065253"
BR2_RAINIER_2U_XML_SYSTEM_FILENAME="RAINIER_hb.system.xml"
BR2_RAINIER_2U_XML_TARGETING_FILENAME="RAINIER_hb.mrw.xml"
BR2_RAINIER_4U_XML_CUSTOM_GIT=y
BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_4U_XML_VERSION="606809047f5073ed9fab4c1503180fec31136b82"
+BR2_RAINIER_4U_XML_VERSION="6267cabb8f02e7b5af84aecef84c5f0b50065253"
BR2_RAINIER_4U_XML_SYSTEM_FILENAME="RAINIER_hb.system.xml"
BR2_RAINIER_4U_XML_TARGETING_FILENAME="RAINIER_hb.mrw.xml"
BR2_PACKAGE_OPENPOWER_PNOR_P10=y
diff --git a/openpower/package/ekb/Config.in b/openpower/package/ekb/Config.in
index da934ec..332216c 100644
--- a/openpower/package/ekb/Config.in
+++ b/openpower/package/ekb/Config.in
@@ -30,7 +30,7 @@
config BR2_EKB_VERSION
string
- default "eeb1a8a192491b97e84e5d8fdcbe0aea73da9c7f" if BR2_EKB_LATEST_VERSION
+ default "72b1c165b709007bcf1ebb3ee20dfd191f1292cd" if BR2_EKB_LATEST_VERSION
default BR2_EKB_CUSTOM_VERSION_VALUE if BR2_EKB_CUSTOM_VERSION
endif
diff --git a/openpower/package/hcode-p10/Config.in b/openpower/package/hcode-p10/Config.in
index b071b0c..5d86532 100644
--- a/openpower/package/hcode-p10/Config.in
+++ b/openpower/package/hcode-p10/Config.in
@@ -31,7 +31,7 @@
config BR2_HCODE_P10_VERSION
string
- default "hw102920a.opmst10" if BR2_HCODE_P10_LATEST_VERSION
+ default "hw103120a.opmst10" if BR2_HCODE_P10_LATEST_VERSION
default BR2_HCODE_P10_CUSTOM_VERSION_VALUE \
if BR2_HCODE_P10_CUSTOM_VERSION
diff --git a/openpower/package/hostboot-binaries/Config.in b/openpower/package/hostboot-binaries/Config.in
index 70e44c4..3d3547d 100644
--- a/openpower/package/hostboot-binaries/Config.in
+++ b/openpower/package/hostboot-binaries/Config.in
@@ -24,7 +24,7 @@
config BR2_HOSTBOOT_BINARIES_VERSION
string
- default "hw102920a.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+ default "hw103120a.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
default BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 9e61417..3bfa2ee 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -82,6 +82,10 @@
# The pdata generated device tree file name will be based on machine xml filename
QSTRIP_OP_MACHINE_XML_FILENAME = $(call qstrip,$(BR2_OPENPOWER_MACHINE_XML_FILENAME))
$(eval BMC_POWER_TARGET_FILENAME = $$(patsubst %.xml,%.dtb,$(QSTRIP_OP_MACHINE_XML_FILENAME)))
+# See Open-Power's Hostboot repo, file: src/build/buildpnor/PnorUtils.pm,
+# function: loadPnorLayout(); at the end of that function the generated PNOR layout XML file
+# is concatenated with "WithOffsets.xml"
+GENERATED_PNOR_LAYOUT_FILES = $(shell find "$(OPENPOWER_PNOR_SCRATCH_DIR)" -maxdepth 1 -name "*WithOffsets.xml")
FILES_TO_TAR = $(HOSTBOOT_BUILD_IMAGES_DIR)/* \
$(OUTPUT_BUILD_DIR)/skiboot-$(SKIBOOT_VERSION)/skiboot.elf \
@@ -90,7 +94,8 @@
$(OUTPUT_BUILD_DIR)/linux-$(LINUX_VERSION)/vmlinux \
$(OUTPUT_BUILD_DIR)/linux-$(LINUX_VERSION)/System.map \
$(FSP_TRACE_IMAGES_DIR)/fsp-trace \
- $(OUTPUT_IMAGES_DIR)/zImage.epapr
+ $(OUTPUT_IMAGES_DIR)/zImage.epapr \
+ $(GENERATED_PNOR_LAYOUT_FILES)
# Subpackages we want to include in the version info (do not include openpower-pnor)
OPENPOWER_VERSIONED_SUBPACKAGES = skiboot
diff --git a/openpower/package/pdata/Config.in b/openpower/package/pdata/Config.in
index 0775b57..9ad5a03 100644
--- a/openpower/package/pdata/Config.in
+++ b/openpower/package/pdata/Config.in
@@ -47,7 +47,7 @@
config BR2_PDATA_VERSION
string
- default "0a98cbbf454ff2ba5b3048a73fccbe3f9c66369e" if BR2_PDATA_LATEST_VERSION
+ default "c0a8ca1e8047cb178c797bf744580225e3fe4c3d" if BR2_PDATA_LATEST_VERSION
default BR2_PDATA_CUSTOM_VERSION_VALUE if BR2_PDATA_CUSTOM_VERSION
endif