Merge pull request #596 from open-power/revert-589-explorer_fw_update_cl407134
Revert "Update OCMB Explorer FW to v8.0 (CL407134)"
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..9e75a64 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 "hw110320t.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..066feca 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 "hw110320t.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/hostboot-p10/Config.in b/openpower/package/hostboot-p10/Config.in
index 148d13f..c98c278 100644
--- a/openpower/package/hostboot-p10/Config.in
+++ b/openpower/package/hostboot-p10/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_P10_VERSION
string
- default "96f171b14bc4ab8d6940b9349168940ba3670a19" if BR2_HOSTBOOT_P10_LATEST_VERSION
+ default "50c778b3694f34793c0e14f156f46ec311592a48" if BR2_HOSTBOOT_P10_LATEST_VERSION
default BR2_HOSTBOOT_P10_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_P10_CUSTOM_VERSION
diff --git a/openpower/package/occ-p10/Config.in b/openpower/package/occ-p10/Config.in
index 2bf0bbc..39a1726 100644
--- a/openpower/package/occ-p10/Config.in
+++ b/openpower/package/occ-p10/Config.in
@@ -43,7 +43,7 @@
config BR2_OCC_P10_VERSION
string
- default "ee53d132498f1a5fefd4bbf94726cd836e8dc4dd" if BR2_OCC_P10_LATEST_VERSION
+ default "cc3a95f783c98f211df5d30a6e253c5554dc8c7b" if BR2_OCC_P10_LATEST_VERSION
default BR2_OCC_P10_CUSTOM_VERSION_VALUE \
if BR2_OCC_P10_CUSTOM_VERSION
diff --git a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
index 2197e9b..528f8e1 100644
--- a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
+++ b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
@@ -14,7 +14,7 @@
OPENPOWER_PNOR_P10_LICENSE = Apache-2.0
OPENPOWER_PNOR_P10_LICENSE_FILES = LICENSE
-OPENPOWER_PNOR_P10_DEPENDENCIES = hostboot-binaries skiboot host-openpower-ffs capp-ucode host-openpower-pnor-util linux-rebuild-with-initramfs host-xz host-sb-signing-utils hostboot-p10 occ-p10 sbe-p10 hcode-p10 ocmb-explorer-fw $(call qstrip,$(BR2_OPENPOWER_P10_XMLS))
+OPENPOWER_PNOR_P10_DEPENDENCIES = hostboot-binaries skiboot host-openpower-ffs capp-ucode host-openpower-pnor-util host-xz host-sb-signing-utils hostboot-p10 occ-p10 sbe-p10 hcode-p10 ocmb-explorer-fw $(call qstrip,$(BR2_OPENPOWER_P10_XMLS))
ifeq ($(BR2_PACKAGE_IMA_CATALOG),y)
OPENPOWER_PNOR_P10_DEPENDENCIES += ima-catalog
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 9e61417..e5fa930 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -26,16 +26,6 @@
OPENPOWER_PNOR_DEPENDENCIES += ima-catalog
endif
-ifeq ($(BR2_PACKAGE_SKIBOOT_EMBED_PAYLOAD),n)
-
-ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
-OPENPOWER_PNOR_DEPENDENCIES += linux-rebuild-with-initramfs
-else
-OPENPOWER_PNOR_DEPENDENCIES += linux
-endif
-
-endif
-
ifeq ($(BR2_OPENPOWER_PNOR_XZ_ENABLED),y)
OPENPOWER_PNOR_DEPENDENCIES += host-xz
XZ_ARG=-xz_compression
@@ -82,6 +72,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 +84,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
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 7236ce3..8f35b34 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
config BR2_SKIBOOT_VERSION
string
- default "v6.6-284-gfa82b1a28" if BR2_SKIBOOT_LATEST_VERSION
+ default "v6.6-291-gc95c8a78e" if BR2_SKIBOOT_LATEST_VERSION
default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
if BR2_SKIBOOT_CUSTOM_VERSION