Merge pull request #4306 from dcrowell77/CL432412
Update Explorer OCMB Firmware to CL432412
diff --git a/openpower/package/hcode-p10/Config.in b/openpower/package/hcode-p10/Config.in
index 8de83c5..564b558 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 "hw090321b.opmst10" if BR2_HCODE_P10_LATEST_VERSION
+ default "hw091321a.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 d91f600..851d415 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 "hw090321b.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+ default "hw091321a.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 0585725..192fce9 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 "e73e13c7dbd6d72c61da7d102c216b1ca7da0b37" if BR2_HOSTBOOT_P10_LATEST_VERSION
+ default "9a79886706d325e05935f81a0610f26de4540282" 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 98cd8db..0742b5a 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 "1427659eb375b5fc1659d8f1a9d6f836e4e45a51" if BR2_OCC_P10_LATEST_VERSION
+ default "e522c82747c496ea160015eb0cfda60d0400c391" 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 9b458d6..296b313 100644
--- a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
+++ b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENPOWER_PNOR_P10_VERSION ?= 2fceb8c999687ffb0fbcb375811c9b074536f56e
+OPENPOWER_PNOR_P10_VERSION ?= 3d96ab52916637063500a4fc733ff7a5552a6cd3
OPENPOWER_PNOR_P10_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_P10_VERSION))
OPENPOWER_PNOR_P10_LICENSE = Apache-2.0
@@ -67,6 +67,9 @@
echo "***PNOR scratch directory: $(PNOR_SCRATCH_DIR)"
mkdir -p $(PNOR_SCRATCH_DIR)
+ echo "***BINARIES_DIR: $(BINARIES_DIR)"
+ echo "***STAGING_DIR: $(STAGING_DIR)"
+
$(TARGET_MAKE_ENV) $(@D)/update_image.pl \
-release p10 \
@@ -172,10 +175,17 @@
$(INSTALL) -m 0644 -D $(PNOR_SCRATCH_DIR)/hostboot_extended.header.bin.ecc \
$(BINARIES_DIR)/mmc/HBI.P10
- # HBD
+ # HBD.bin SECTION is the COMBO (RO and RW) as built by genPnorImages.pl
$(INSTALL) -m 0644 -D $(PNOR_SCRATCH_DIR)/$(TARGETING_BINARY_FILENAME) \
$(BINARIES_DIR)/mmc/HBD.$(XML_VAR)
+ # HBD_RW.bin SECTION conditionally built by genPnorImages.pl
+ # Not consumed as a LID today since its a PNOR partition
+ if [ -e $(PNOR_SCRATCH_DIR)/$(TARGETING_BINARY_FILENAME).unprotected ]; then \
+ $(INSTALL) -m 0644 -D $(PNOR_SCRATCH_DIR)/$(TARGETING_BINARY_FILENAME).unprotected \
+ $(BINARIES_DIR)/mmc/HBD_RW.$(XML_VAR) ; \
+ fi
+
# SBE
test -f "$(BINARIES_DIR)/mmc/SBE.P10" ||\
$(INSTALL) -m 0644 -D $(PNOR_SCRATCH_DIR)/$(BR2_HOSTBOOT_P10_BINARY_SBE_FILENAME) \
@@ -326,6 +336,7 @@
define OPENPOWER_PNOR_P10_INSTALL_IMAGES_CMDS
+ # CLEANUP OLD IMAGES
if [ -n "$(BR2_OPENPOWER_PNOR_P10_LEGACY_PNOR_TARGET)" ] ; then \
rm -f $(BINARIES_DIR)/*.pnor \
$(BINARIES_DIR)/*.pnor.squashfs.tar \
@@ -334,6 +345,8 @@
$(BINARIES_DIR)/*.ebmc_lids.tar.gz ;\
rm -rf $(STAGING_DIR)/openpower_pnor_scratch \
$(STAGING_DIR)/openpower_pnor_scratch.* ;\
+ rm -rf $(BINARIES_DIR)/mmc \
+ $(BINARIES_DIR)/mmc.tar.gz ;\
fi
$(foreach xmlpkg,$(BR2_OPENPOWER_P10_XMLS),\
diff --git a/openpower/package/sbe-p10/Config.in b/openpower/package/sbe-p10/Config.in
index 89d996d..d0573d4 100644
--- a/openpower/package/sbe-p10/Config.in
+++ b/openpower/package/sbe-p10/Config.in
@@ -26,7 +26,7 @@
config BR2_SBE_P10_VERSION
string
- default "2b13aa6a3cd7ab5830748f26ce704496b1e5c22e" if BR2_SBE_P10_LATEST_VERSION
+ default "c304de9ce6927bdf4ea1139f2f6be957243e0dcb" if BR2_SBE_P10_LATEST_VERSION
default BR2_SBE_P10_CUSTOM_VERSION_VALUE \
if BR2_SBE_P10_CUSTOM_VERSION