commit 22d01af2aad326555b73bc58865a6069886f7137
author Deb McLemore <debmc@us.ibm.com> Thu Nov 10 16:01:22 2022 -0600
committer Deb McLemore <debmc@us.ibm.com> Wed Nov 16 16:54:08 2022 -0600
tree 0eacfa044c54f92e8bfcb738efd0b2cde2384532
parent 31a9dadbd77d043137535d2ecffe03c9c1d584c8

Hostboot Add Planar SPD PNOR support

PFHB-5
Signed-off-by: Deb McLemore <debmc@us.ibm.com>

openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk

diff --git a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
index 98d65ab..11b76e6 100644
--- a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
+++ b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
@@ -58,6 +58,12 @@
         $(eval XML_FILENAME = $$(call qstrip,$$(BR2_$(XML_VAR)_FILENAME)))
         echo "***XML_FILENAME: $(XML_FILENAME)"
 
+        $(eval PSPD_DATA_FILENAME = $$(patsubst %.xml,%.pspddata,$(XML_FILENAME)))
+        echo "***PSPD_DATA_FILENAME: $(PSPD_DATA_FILENAME)"
+
+        $(eval PSPD_BINARY_FILENAME = $$(patsubst %.xml,%.PSPD.bin,$(XML_FILENAME)))
+        echo "***PSPD_BINARY_FILENAME: $(PSPD_BINARY_FILENAME)"
+
         $(eval WOF_BINARY_FILENAME = $$(patsubst %.xml,%.wofdata,$(XML_FILENAME)))
         echo "***WOF_BINARY_FILENAME: $(WOF_BINARY_FILENAME)"
 
@@ -94,6 +100,7 @@
             -occ_binary_filename $(OCC_STAGING_DIR)/$(BR2_OCC_P10_BIN_FILENAME) \
             -ima_catalog_binary_filename $(BINARIES_DIR)/$(BR2_IMA_CATALOG_P10_FILENAME) \
             -openpower_version_filename $(OPENPOWER_PNOR_P10_VERSION_FILE) \
+            -pspd_binary_filename $(STAGING_DIR)/openpower_mrw_scratch/$(PSPD_BINARY_FILENAME) \
             -wof_binary_filename $(STAGING_DIR)/openpower_mrw_scratch/$(WOF_BINARY_FILENAME) \
             -memd_binary_filename $(STAGING_DIR)/openpower_mrw_scratch/$(MEMD_BINARY_FILENAME) \
             -payload $(BINARIES_DIR)/$(BR2_SKIBOOT_P10_LID_NAME) \
@@ -135,7 +142,8 @@
                 -memddata_binary_filename $(PNOR_SCRATCH_DIR)/memd_extra_data.bin.ecc \
                 -ocmbfw_binary_filename $(PNOR_SCRATCH_DIR)/$(BR2_OCMBFW_P10_PROCESSED_FILENAME) \
                 -openpower_version_filename $(PNOR_SCRATCH_DIR)/openpower_pnor_version.bin  \
-                -devtree_binary_filename $(PNOR_SCRATCH_DIR)/DEVTREE.bin ;\
+                -devtree_binary_filename $(PNOR_SCRATCH_DIR)/DEVTREE.bin \
+                -pspd_binary_filename $(PNOR_SCRATCH_DIR)/PSPD.bin ;\
             $(INSTALL) $(STAGING_DIR)/pnor.$(XML_VAR)/$(XML_VAR).pnor $(BINARIES_DIR) ;\
             PATH=$(HOST_DIR)/usr/bin:$(PATH) $(HOST_DIR)/usr/bin/generate-tar -i squashfs \
                 -m $(XML_VAR) \
@@ -342,6 +350,12 @@
         $(INSTALL) -m 0644 -D $(PNOR_SCRATCH_DIR)/DEVTREE.bin \
             $(BINARIES_DIR)/mmc/DEVTREE.$(XML_VAR)
 
+        # PSPD.bin SECTION conditionally built by genPnorImages.pl
+        if [ -e $(PNOR_SCRATCH_DIR)/PSPD.bin ]; then \
+            $(INSTALL) -m 0644 -D $(PNOR_SCRATCH_DIR)/PSPD.bin \
+                $(BINARIES_DIR)/mmc/PSPD.$(XML_VAR) ; \
+        fi
+
 endef
 
 define OPENPOWER_PNOR_P10_INSTALL_IMAGES_CMDS