Create cumulus pnor image

Change-Id: Icef3a2c60c3439e0b51bccb82107bceaba9ce181
RTC: 176509
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42630
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 26 insertions, 3 deletions

diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index 6a09a7278..e30c9bfc5 100644..100755
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -88,6 +88,7 @@ COPY_FILES = \
     src/usr/targeting/common/xmltohb/attribute_types_hb.xml:openpower \
     src/usr/targeting/common/xmltohb/target_types_hb.xml:openpower \
     src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml:openpower \
+    src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml:openpower \
     src/usr/targeting/common/xmltohb/xmltohb.pl:openpower \
     src/usr/targeting/xmltohb/updatetempsxml.pl:openpower \
     src/include/usr/vmmconst.h:openpower \
@@ -249,8 +250,11 @@ fsp.tar_CONTENTS = \
     $(if $(FAKEPNOR), img/vpo_djvpd.dat, ) \
     $(if $(FAKEPNOR), img/dvpd.dat, ) \
     img/simics_NIMBUS_targeting.bin \
+    img/simics_CUMULUS_targeting.bin \
     $(if $(CONFIG_SECUREBOOT),img/simics_NIMBUS_targeting.bin.protected) \
     $(if $(CONFIG_SECUREBOOT),img/simics_NIMBUS_targeting.bin.unprotected) \
+    $(if $(CONFIG_SECUREBOOT),img/simics_CUMULUS_targeting.bin.protected) \
+    $(if $(CONFIG_SECUREBOOT),img/simics_CUMULUS_targeting.bin.unprotected) \
     obj/genfiles/fapiattrs.xml \
     obj/genfiles/hb_plat_attr_srvc.H \
     src/import/hwpf/fapi2/xml/attribute_info/hb_temp_defaults.xml \
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile
index 02bbad59e..bd5f6e62b 100755
--- a/src/build/mkrules/hbfw/img/makefile
+++ b/src/build/mkrules/hbfw/img/makefile
@@ -230,9 +230,13 @@ ENGD_OBJPATH = ${HBFW_OBJPATH:S/hbfw\/img/engd\/href/g}
 # Input images
 ## Chip Specific
 NIMBUS_HBD_IMG = simics_NIMBUS_targeting.bin
+CUMULUS_HBD_IMG = simics_CUMULUS_targeting.bin
 NIMBUS_HCODE_IMG = ${ENGD_SRCPATH:Fp9n.hw_ref_image.bin}
+CUMULUS_HCODE_IMG = ${ENGD_SRCPATH:Fp9c.hw_ref_image.bin}
 NIMBUS_SBE_IMG = p9nSbePartition.bin
+CUMULUS_SBE_IMG = p9cSbePartition.bin
 NIMBUS_OCC_IMG = ${bb}/images/ppc/lab/fs/p9le/rootfs/opt/extucode/81e00430.lid
+CUMULUS_OCC_IMG = ${bb}/images/ppc/lab/fs/p9le/rootfs/opt/extucode/81e00430.lid
 ## System Specific
 ZZ_WOFDATA_IMG = ${ENGD_WOFPATH:Fzz_wof_data.bin}
 
@@ -242,9 +246,13 @@ NIMBUS_VPO_HBD_IMG = vbu_NIMBUS_targeting.bin
 # Output final images
 ## Chip Specific
 NIMBUS_HBD_FINAL_IMG = NIMBUS.HBD.bin
+CUMULUS_HBD_FINAL_IMG = CUMULUS.HBD.bin
 NIMBUS_HCODE_FINAL_IMG = NIMBUS.HCODE.bin
+CUMULUS_HCODE_FINAL_IMG = CUMULUS.HCODE.bin
 NIMBUS_SBE_FINAL_IMG = NIMBUS.SBE.bin
+CUMULUS_SBE_FINAL_IMG = CUMULUS.SBE.bin
 NIMBUS_OCC_FINAL_IMG = NIMBUS.OCC.bin
+CUMULUS_OCC_FINAL_IMG = CUMULUS.OCC.bin
 ## System Specific
 ZZ_WOFDATA_FINAL_IMG = ZZ.WOFDATA.bin
 
@@ -254,19 +262,26 @@ ZZ_WOFDATA_FINAL_IMG = ZZ.WOFDATA.bin
     # Paramemters passed into GEN_PNOR_IMAGE_SCRIPT.
     .if(${DEFAULT_PNOR} == 1)
         GEN_NIMBUS_BIN_FILES = NIMBUS:SBE=${${NIMBUS_SBE_IMG}:P},HCODE=${${NIMBUS_HCODE_IMG}:P},OCC=${${NIMBUS_OCC_IMG}:P},HBD=${${NIMBUS_HBD_IMG}:P}
+        GEN_CUMULUS_BIN_FILES = CUMULUS:SBE=${${CUMULUS_SBE_IMG}:P},HCODE=${${CUMULUS_HCODE_IMG}:P},OCC=${${CUMULUS_OCC_IMG}:P},HBD=${${CUMULUS_HBD_IMG}:P}
     .else
         GEN_NIMBUS_BIN_FILES = NIMBUS:SBE=${${NIMBUS_SBE_IMG}:P},HCODE=${${NIMBUS_HCODE_IMG}:P},HBD=${${NIMBUS_HBD_IMG}:P}
+        GEN_CUMULUS_BIN_FILES = CUMULUS:SBE=${${CUMULUS_SBE_IMG}:P},HCODE=${${CUMULUS_HCODE_IMG}:P},HBD=${${CUMULUS_HBD_IMG}:P}
     .endif
     GEN_ZZ_BIN_FILES = ZZ:WOFDATA=${${ZZ_WOFDATA_IMG}:P}
     #@TODO RTC:163810 - Put SBEC back "--systemBinFile  SBEC=${${SBEC_IMG}:P}"
     SYSTEM_SPECIFIC_PARAMS = --install-all --emit-eccless ${TARGET_TEST:b--test} ${CONFIG_SECUREBOOT:b--secureboot}  \
                              --pnorLayout ${PNOR_LAYOUT} ${CORRUPT_PARAMS} ${HB_STANDALONE:b--hb-standalone} \
-                             --systemBinFiles ${GEN_NIMBUS_BIN_FILES} --systemBinFiles ${GEN_ZZ_BIN_FILES} --hwKeyHashFile ${IMPRINT_HW_KEY_HASH}
+                             --systemBinFiles ${GEN_NIMBUS_BIN_FILES} \                            
+                             --systemBinFiles ${GEN_CUMULUS_BIN_FILES} \
+                             --systemBinFiles ${GEN_ZZ_BIN_FILES} \
+                             --hwKeyHashFile ${IMPRINT_HW_KEY_HASH}
 .else
     # Parameters passed into GEN_PNOR_IMAGE_SCRIPT.
     GEN_NIMBUS_BIN_FILES = NIMBUS:HCODE=${${NIMBUS_HCODE_IMG}:P},HBD=${${NIMBUS_VPO_HBD_IMG}:P}
+    GEN_CUMULUS_BIN_FILES = CUMULUS:HCODE=${${CUMULUS_HCODE_IMG}:P}
     SYSTEM_SPECIFIC_PARAMS = --pnorLayout ${PNOR_LAYOUT} \
-                             --systemBinFiles ${GEN_NIMBUS_BIN_FILES}
+                             --systemBinFiles ${GEN_NIMBUS_BIN_FILES} \
+                             --systemBinFiles ${GEN_CUMULUS_BIN_FILES}
 .endif
 
 gen_system_specific_images_bypass_cache :
@@ -288,11 +303,14 @@ gen_system_specific_images: build_sbe_partitions .PMAKE
 HOSTBOOT_DEFAULT_SECTIONS = HBBL=${HBBL_FINAL_IMG},HBB=${HBB_FINAL_IMG},HBI=${HBI_FINAL_IMG},HBRT=${HBRT_FINAL_IMG},TEST=${TEST_FINAL_IMG},TESTRO=${TESTRO_FINAL_IMG},HBEL=${HBEL_FINAL_IMG},GUARD=${GUARD_FINAL_IMG},GLOBAL=${GLOBAL_FINAL_IMG},PAYLOAD=${PAYLOAD_FINAL_IMG},CVPD=${CVPD_FINAL_IMG},MVPD=${MVPD_FINAL_IMG},DJVPD=${DJVPD_FINAL_IMG},RINGOVD=${RINGOVD_FINAL_IMG},SBKT=${SBKT_FINAL_IMG},FIRDATA=${FIRDATA_FINAL_IMG}
 .if(${DEFAULT_PNOR} == 1)
     NIMBUS_SECT = HBD=${NIMBUS_HBD_FINAL_IMG},SBE=${NIMBUS_SBE_FINAL_IMG},HCODE=${NIMBUS_HCODE_FINAL_IMG},OCC=${NIMBUS_OCC_FINAL_IMG},WOFDATA=${ZZ_WOFDATA_FINAL_IMG}
+    CUMULUS_SECT = HBD=${CUMULUS_HBD_FINAL_IMG},SBE=${CUMULUS_SBE_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG},OCC=${CUMULUS_OCC_FINAL_IMG}
 .else
     NIMBUS_SECT = HBD=${NIMBUS_HBD_FINAL_IMG},SBE=${NIMBUS_SBE_FINAL_IMG},HCODE=${NIMBUS_HCODE_FINAL_IMG},WOFDATA=${ZZ_WOFDATA_FINAL_IMG}
+    CUMULUS_SECT = HBD=${CUMULUS_HBD_FINAL_IMG},SBE=${CUMULUS_SBE_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG}
 .endif
 PNOR_IMG_INFO = \
    nimbus.pnor:${PNOR_LAYOUT}:${NIMBUS_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
+   cumulus.pnor:${PNOR_LAYOUT}:${CUMULUS_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
    ${FIPS_PNOR_INFO}
 
 # To build fake PNOR, set FAKEPNOR to filename of file to build,
@@ -304,8 +322,9 @@ PNOR_IMG_INFO = \
 .if(${FAKEPNOR} != "")
     HOSTBOOT_DEFAULT_SECTIONS = HBI=${HBI_FINAL_IMG},HBEL=${HBEL_FINAL_IMG},MVPD=${MVPD_FINAL_IMG},DJVPD=${DJVPD_FINAL_IMG},CVPD=${VPO_FAKE_DVPD},FIRDATA=${FIRDATA_FINAL_IMG}
     NIMBUS_SECT = HBD=${NIMBUS_HBD_FINAL_IMG},HCODE=${NIMBUS_HCODE_FINAL_IMG}
+    CUMULUS_SECT = HBD=${CUMULUS_HBD_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG}
     PNOR_IMG_INFO = \
-        ${FAKEPNOR}:${PNOR_LAYOUT}:${NIMBUS_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
+        ${FAKEPNOR}:${PNOR_LAYOUT}:${NIMBUS_SECT}:${CUMULUS_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
         ${FIPS_PNOR_INFO}
 .endif