Enable Cumulus CDIMM Config

Change-Id: I76fd0d1c401a8ea68904e9982c48ea7588f2c16e
RTC: 188480
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54834
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@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>
Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

9 files changed, 103 insertions, 16 deletions

diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup
index 2469ef869..03e950681 100755
--- a/src/build/citest/etc/workarounds.presimsetup
+++ b/src/build/citest/etc/workarounds.presimsetup
@@ -40,9 +40,15 @@ mkdir -p  $sb/simu/data
 echo "+++ Get some simics info changes"
 sbex -t 1045730
 
+###############################################################################
+### NOTE - if you need to sbex a simicsInfo track it needs to be done BEFORE
+###        executing the code below
+###############################################################################
 chmod +w $sb/simu/data/simicsInfo
-egrep -v "nimbus.pnor|cumulus.pnor" $sb/simu/data/simicsInfo > $sb/simu/data/simicsInfo.new
+egrep -v "nimbus.pnor|cumulus.pnor|cumulus_cdimm.pnor" $sb/simu/data/simicsInfo > $sb/simu/data/simicsInfo.new
 mv $sb/simu/data/simicsInfo.new $sb/simu/data/simicsInfo
 echo "IMGS:NIMBUS_PNOR_IMG | FLASH:nimbus.pnor | LOC:SB_CHAIN/images/ppc/lab/flash" >> $sb/simu/data/simicsInfo
 echo "IMGS:BOSTON_PNOR_IMG | FLASH:nimbus.pnor | LOC:SB_CHAIN/images/ppc/lab/flash" >> $sb/simu/data/simicsInfo
-echo "IMGS:CUMULUS_PNOR_IMG | FLASH:cumulus.pnor | LOC:SB_CHAIN/images/ppc/lab/flash" >> $sb/simu/data/simicsInfo
\ No newline at end of file
+echo "IMGS:CUMULUS_PNOR_IMG | FLASH:cumulus.pnor | LOC:SB_CHAIN/images/ppc/lab/flash" >> $sb/simu/data/simicsInfo
+echo "MACHINE:CUMULUS_CDIMM| CODENAME:"Cumulus" | DESC:"P9 Cumulus standalone config" | CONF_FILE:P9_CUMULUS.config | TGT:targets/p9_cumulus/p9_cumulus_1.simics | REL_EXLD:fips730,fips731 | CONTEXT:ppc | SIMENV:DEFAULT | PROC:P9 | IMGS:CUMULUS_CDIMM_PNOR_IMG | IMGS:OTPROM_SBE_IMG_DD1_BIN | IMGS:SEEPROM_SBE_IMG_DD1_BIN | IMGS:PIBMEM_SBE_IMG_DD1_BIN | IMGS:OTPROM_SBE_IMG_DD2_BIN | IMGS:SEEPROM_SBE_IMG_P9C_BIN | IMGS:PIBMEM_SBE_IMG_DD2_BIN | IMGS:HOSTBOOT_IMG" >> $sb/simu/data/simicsInfo
+echo "IMGS:CUMULUS_CDIMM_PNOR_IMG | FLASH:cumulus_cdimm.pnor | LOC:SB_CHAIN/images/ppc/lab/flash" >> $sb/simu/data/simicsInfo
diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index 322f322ff..aeadb37e5 100755
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -92,6 +92,7 @@ COPY_FILES = \
     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/simics_CUMULUS_CDIMM.system.xml:openpower \
     src/usr/targeting/common/xmltohb/xmltohb.pl:openpower \
     src/usr/targeting/xmltohb/updatetempsxml.pl:openpower \
     src/include/usr/vmmconst.h:openpower \
@@ -233,6 +234,8 @@ simics.tar_CONTENTS = \
     img/procmvpd_p9c.dat \
     img/cvpd.dat \
     img/dvpd.dat \
+    img/cvpd_cdimm.dat \
+    img/dimmspd_cdimm.dat \
     obj/genfiles/attrInfo.csv \
     obj/genfiles/attrEnumInfo.csv \
     obj/genfiles/targAttrInfo.csv
@@ -264,10 +267,13 @@ fsp.tar_CONTENTS = \
     $(if $(FAKEPNOR), img/dvpd.dat, ) \
     img/simics_NIMBUS_targeting.bin \
     img/simics_CUMULUS_targeting.bin \
+    img/simics_CUMULUS_CDIMM_targeting.bin \
     img/simics_NIMBUS_targeting.bin.protected \
     img/simics_NIMBUS_targeting.bin.unprotected \
     img/simics_CUMULUS_targeting.bin.protected \
     img/simics_CUMULUS_targeting.bin.unprotected \
+    img/simics_CUMULUS_CDIMM_targeting.bin.protected \
+    img/simics_CUMULUS_CDIMM_targeting.bin.unprotected \
     obj/genfiles/fapiattrs.xml \
     obj/genfiles/attribute_types_sp.xml \
     obj/genfiles/target_types_sp.xml \
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile
index 01be54af3..d13a5528f 100755
--- a/src/build/mkrules/hbfw/img/makefile
+++ b/src/build/mkrules/hbfw/img/makefile
@@ -334,6 +334,7 @@ ENGD_OBJPATH = ${HBFW_OBJPATH:S/hbfw\/img/engd\/href/g}
 ## Chip Specific
 NIMBUS_HBD_IMG = simics_NIMBUS_targeting.bin
 CUMULUS_HBD_IMG = simics_CUMULUS_targeting.bin
+CUMULUS_CDIMM_HBD_IMG = simics_CUMULUS_CDIMM_targeting.bin
 NIMBUS_HCODE_IMG = ${ENGD_SRCPATH:Fp9n.hw_ref_image.bin}
 CUMULUS_HCODE_IMG = ${ENGD_SRCPATH:Fp9c.hw_ref_image.bin}
 CUMULUS_CENHWIMG_IMG = ${ENGD_SRCPATH:Fcen.hw_ref_image.bin}
@@ -362,6 +363,7 @@ NIMBUS_VPO_HBD_IMG = vbu_NIMBUS_targeting.bin
 ## Chip Specific
 NIMBUS_HBD_FINAL_IMG = NIMBUS.HBD.bin
 CUMULUS_HBD_FINAL_IMG = CUMULUS.HBD.bin
+CUMULUS_CDIMM_HBD_FINAL_IMG = CUMULUS_CDIMM.HBD.bin
 NIMBUS_HCODE_FINAL_IMG = NIMBUS.HCODE.bin
 CUMULUS_HCODE_FINAL_IMG = CUMULUS.HCODE.bin
 CUMULUS_CENHWIMG_FINAL_IMG = CUMULUS.CENHWIMG.bin
@@ -391,9 +393,11 @@ ZZ2U_HBD_FINAL_IMG = ZZ-2U.HBD.bin
     .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},CENHWIMG=${NIMBUS_CENHWIMG_IMG}
         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},CENHWIMG=${${CUMULUS_CENHWIMG_IMG}:P}
+        GEN_CUMULUS_CDIMM_BIN_FILES = CUMULUS_CDIMM:SBE=${${CUMULUS_SBE_IMG}:P},HCODE=${${CUMULUS_HCODE_IMG}:P},OCC=${${CUMULUS_OCC_IMG}:P},HBD=${${CUMULUS_CDIMM_HBD_IMG}:P},CENHWIMG=${${CUMULUS_CENHWIMG_IMG}:P}
     .else
         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},CENHWIMG=${NIMBUS_CENHWIMG_IMG}
         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},CENHWIMG=${${CUMULUS_CENHWIMG_IMG}:P}
+        GEN_CUMULUS_CDIMM_BIN_FILES = CUMULUS_CDIMM:SBE=${${CUMULUS_SBE_IMG}:P},HCODE=${${CUMULUS_HCODE_IMG}:P},OCC=${${CUMULUS_OCC_IMG}:P},HBD=${${CUMULUS_CDIMM_HBD_IMG}:P},CENHWIMG=${${CUMULUS_CENHWIMG_IMG}:P}
     .endif
     GEN_ZZ_BIN_FILES = ZZ:WOFDATA=${${ZZ_WOFDATA_IMG}:P},MEMD=${${ZZ_MEMD_IMG}:P},HBD=${${ZZ_HBD_IMG}:P}
     GEN_ZEPPELIN_BIN_FILES = ZEPPELIN:WOFDATA=${${ZEPPELIN_WOFDATA_IMG}:P},MEMD=${${ZEPPELIN_MEMD_IMG}:P},HBD=${${ZEPPELIN_HBD_IMG}:P}
@@ -404,6 +408,7 @@ ZZ2U_HBD_FINAL_IMG = ZZ-2U.HBD.bin
                              --pnorLayout ${PNOR_LAYOUT} ${CORRUPT_PARAMS} ${HB_STANDALONE:b--hb-standalone} \
                              --systemBinFiles ${GEN_NIMBUS_BIN_FILES} \
                              --systemBinFiles ${GEN_CUMULUS_BIN_FILES} \
+                             --systemBinFiles ${GEN_CUMULUS_CDIMM_BIN_FILES} \
                              --systemBinFiles ${GEN_ZZ_BIN_FILES} \
                              --systemBinFiles ${GEN_ZEPPELIN_BIN_FILES} \
                              --systemBinFiles ${GEN_FLEETWOOD_BIN_FILES} \
@@ -413,9 +418,11 @@ ZZ2U_HBD_FINAL_IMG = ZZ-2U.HBD.bin
     # Parameters passed into GEN_PNOR_IMAGE_SCRIPT.
     GEN_NIMBUS_BIN_FILES = NIMBUS:HCODE=${${NIMBUS_HCODE_IMG}:P},HBD=${${NIMBUS_VPO_HBD_IMG}:P},CENHWIMG=EMPTY
     GEN_CUMULUS_BIN_FILES = CUMULUS:HCODE=${${CUMULUS_HCODE_IMG}:P},CENHWIMG=${${CUMULUS_CENHWIMG_IMG}:P}
+    GEN_CUMULUS_CDIMM_BIN_FILES = CUMULUS:HCODE=${${CUMULUS_HCODE_IMG}:P},CENHWIMG=${${CUMULUS_CENHWIMG_IMG}:P}
     SYSTEM_SPECIFIC_PARAMS = --pnorLayout ${PNOR_LAYOUT} \
                              --systemBinFiles ${GEN_NIMBUS_BIN_FILES} \
-                             --systemBinFiles ${GEN_CUMULUS_BIN_FILES}
+                             --systemBinFiles ${GEN_CUMULUS_BIN_FILES} \
+                             --systemBinFiles ${GEN_CUMULUS_CDIMM_BIN_FILES}
 .endif
 
 gen_system_specific_images_bypass_cache : dump-secureboot-config
@@ -438,14 +445,17 @@ 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},TESTLOAD=${TESTLOAD_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},MEMD=${MEMD_FINAL_IMG}
     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},CENHWIMG=${NIMBUS_CENHWIMG_FINAL_IMG}
     CUMULUS_SECT = HBD=${CUMULUS_HBD_FINAL_IMG},SBE=${CUMULUS_SBE_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG},OCC=${CUMULUS_OCC_FINAL_IMG},WOFDATA=${ZEPPELIN_WOFDATA_FINAL_IMG},CENHWIMG=${CUMULUS_CENHWIMG_FINAL_IMG}
+    CUMULUS_CDIMM_SECT = HBD=${CUMULUS_CDIMM_HBD_FINAL_IMG},SBE=${CUMULUS_SBE_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG},OCC=${CUMULUS_OCC_FINAL_IMG},WOFDATA=${ZEPPELIN_WOFDATA_FINAL_IMG},CENHWIMG=${CUMULUS_CENHWIMG_FINAL_IMG}
 .else
     HOSTBOOT_DEFAULT_SECTIONS = HBBL=${HBBL_FINAL_IMG},HBB=${HBB_FINAL_IMG},HBI=${HBI_FINAL_IMG},HBRT=${HBRT_FINAL_IMG},HBEL=${HBEL_FINAL_IMG},GUARD=${GUARD_FINAL_IMG},GLOBAL=${GLOBAL_FINAL_IMG},CVPD=${CVPD_FINAL_IMG},MVPD=${MVPD_FINAL_IMG},DJVPD=${DJVPD_FINAL_IMG},RINGOVD=${RINGOVD_FINAL_IMG},SBKT=${SBKT_FINAL_IMG},MEMD=${MEMD_FINAL_IMG}
     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},CENHWIMG=${NIMBUS_CENHWIMG_FINAL_IMG}
     CUMULUS_SECT = HBD=${CUMULUS_HBD_FINAL_IMG},SBE=${CUMULUS_SBE_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG},OCC=${CUMULUS_OCC_FINAL_IMG},WOFDATA=${ZEPPELIN_WOFDATA_FINAL_IMG},CENHWIMG=${CUMULUS_CENHWIMG_FINAL_IMG}
+    CUMULUS_CDIMM_SECT = HBD=${CUMULUS_CDIMM_HBD_FINAL_IMG},SBE=${CUMULUS_SBE_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG},OCC=${CUMULUS_OCC_FINAL_IMG},WOFDATA=${ZEPPELIN_WOFDATA_FINAL_IMG},CENHWIMG=${CUMULUS_CENHWIMG_FINAL_IMG}
 .endif
 PNOR_IMG_INFO = \
    nimbus.pnor:${PNOR_LAYOUT}:${NIMBUS_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
    cumulus.pnor:${PNOR_LAYOUT}:${CUMULUS_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
+   cumulus_cdimm.pnor:${PNOR_LAYOUT}:${CUMULUS_CDIMM_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
    ${FIPS_PNOR_INFO}
 
 # To build fake PNOR, set FAKEPNOR to filename of file to build,
@@ -458,8 +468,9 @@ PNOR_IMG_INFO = \
     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},CENHWIMG=${NIMBUS_CENHWIMG_FINAL_IMG}
     CUMULUS_SECT = HBD=${CUMULUS_HBD_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG},CENHWIMG=${CUMULUS_CENHWIMG_FINAL_IMG}
+    CUMULUS_CDIMM_SECT = HBD=${CUMULUS_CDIMM_HBD_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG},CENHWIMG=${CUMULUS_CENHWIMG_FINAL_IMG}
     PNOR_IMG_INFO = \
-        ${FAKEPNOR}:${PNOR_LAYOUT}:${NIMBUS_SECT}:${CUMULUS_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
+        ${FAKEPNOR}:${PNOR_LAYOUT}:${NIMBUS_SECT}:${CUMULUS_SECT}:${CUMULUS_CDIMM_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
         ${FIPS_PNOR_INFO}
 .endif
 
diff --git a/src/build/simics/hb-pnor-vpd-preload.pl b/src/build/simics/hb-pnor-vpd-preload.pl
index 20f89608b..87314744e 100755
--- a/src/build/simics/hb-pnor-vpd-preload.pl
+++ b/src/build/simics/hb-pnor-vpd-preload.pl
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2017
+# Contributors Listed Below - COPYRIGHT 2012,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -38,6 +38,7 @@ my $machine;
 my $procConfig = "uninit";
 my $centConfig = "uninit";
 my $maxProcs = 8;
+my $dimmType = "ISDIMM";
 
 # Create temp file for MVPD
 my $emptyMVPDfh;
@@ -59,14 +60,15 @@ my $mvpdFile_ven = "procmvpd_ven.dat";
 my $mvpdFile_p9n = "procmvpd_p9n.dat";
 my $mvpdFile_p9c = "procmvpd_p9c.dat";
 my $cvpdFile = "cvpd.dat";
+my $cvpdCdimmFile = "cvpd_cdimm.dat";
 my $dvpdFile = "dvpd.dat";
-my $memVpdFile = $cvpdFile;
+my $memVpdFile = "";
 my $spdFile = "dimmspd.dat";
+my $spdCdimmFile = "dimmspd_cdimm.dat";
 my $sysMVPD = "sysmvpd.dat";
 my $sysMemVPD = "sysmemvpd.dat";
 my $sysSPD = "sysspd.dat";
 
-
 my $MAX_CENT_PER_PROC = 8;
 my $MAX_DIMMS_PER_CENT = 8;
 my $MAX_MCS = 8;
@@ -131,6 +133,11 @@ while( $ARGV = shift )
             usage();
         }
     }
+    elsif( $ARGV =~ m/--dimmType/ ||
+           $ARGV =~ m/-dc/ )
+    {
+        $dimmType = shift;
+    }
     elsif( $ARGV =~ m/--examples/ ||
            $ARGV =~ m/-e/ )
     {
@@ -142,6 +149,16 @@ while( $ARGV = shift )
     }
 }
 
+if ($dimmType eq "CDIMM")
+{
+    $memVpdFile = $cvpdCdimmFile;
+}
+else
+{
+    $memVpdFile = $cvpdFile;
+}
+
+
 #figure out default procConfig if one was not specified.
 #if procConfig was specified, validate it's length.
 if( $procConfig =~ m/uninit/ )
@@ -458,8 +475,17 @@ sub createSPDData
                      substr($procConfig,$proc,1) =~ /1/ )
                 {
                     debugMsg( "$machine( $proc, $mcs, $dimm ): Real File" );
-                    # Use the real data to the full image
-                    $sourceFile = "$dataPath/$spdFile";
+                    if ($dimmType eq "CDIMM")
+                    {
+                         # CDIMM Config - Use the real data to the full image
+                         $sourceFile = "$dataPath/$spdCdimmFile";
+                    }
+                    else
+                    {
+                        # Assume ISDIMM - Use the real data to the full image
+                        $sourceFile = "$dataPath/$spdFile";
+                    }
+                    
                 }
                 else
                 {
@@ -569,7 +595,7 @@ sub getMemoryConfig
                     }
                 }
             }
-            elsif( $machine eq "CUMULUS" )
+            elsif( $machine eq "CUMULUS" || $machine eq "CUMULUS_CDIMM" )
             {
                 # Plugging order is:
                 #   Processor 0 - 3
diff --git a/src/build/simics/hb-pnor-vpd-preload.py b/src/build/simics/hb-pnor-vpd-preload.py
index 1c2ce6a0d..9dff2c3ae 100755
--- a/src/build/simics/hb-pnor-vpd-preload.py
+++ b/src/build/simics/hb-pnor-vpd-preload.py
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2017
+# Contributors Listed Below - COPYRIGHT 2012,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -35,16 +35,22 @@ numProcs = os.environ.get( "NUM_PROCS");
 dimmsPerProc = os.environ.get( "DIMMS_PER_PROC");
 numCentaurPerProcParm = "";
 numCentaurPerProc = "0";
-if (thisSys == "CUMULUS"):
+dimmType = "ISDIMM";
+print "dimmType = " + dimmType;
+if (thisSys == "CUMULUS" or thisSys == "CUMULUS_CDIMM"):
+    print "CUMULUS OR CUMULUS_CDIMM";
     numCentaurPerProc=str(int(dimmsPerProc)/2);
     numCentaurPerProcParm=" --numCentPerProc " + numCentaurPerProc;
 pass
+if (thisSys == "CUMULUS_CDIMM"):
+    dimmType = "CDIMM";
+pass
 procChipTypeParm = "";
 if os.environ.has_key('HB_PROC_CHIP_TYPE'):
     procChipType = os.environ.get('HB_PROC_CHIP_TYPE');
     procChipTypeParm=" --procChipType " + procChipType;
 pass
-cmd = toolLoc + "/hb-pnor-vpd-preload.pl --numProcs " + numProcs + numCentaurPerProcParm + procChipTypeParm + " --machine " + thisSys + " --dataPath " + toolLoc
+cmd = toolLoc + "/hb-pnor-vpd-preload.pl --numProcs " + numProcs + numCentaurPerProcParm + procChipTypeParm + " --machine " + thisSys + " --dataPath " + toolLoc + " --dimmType " + dimmType
 print "Generate PNOR VPD for " + numProcs + " processor(s), and " + numCentaurPerProc + " Centaur(s) per Processor.";
 args = shlex.split( cmd );
 subprocess.call( args );
diff --git a/src/build/simics/startup.simics b/src/build/simics/startup.simics
index aa63b13a4..f712811ac 100755
--- a/src/build/simics/startup.simics
+++ b/src/build/simics/startup.simics
@@ -4,10 +4,14 @@ $hb_script_location = (python "''.join(map('/'.__add__,\""+$hb_startup_path+"\"[
 python "os.environ['HB_TOOLPATH'] = \""+$hb_script_location+"\""
 
 $model = (shell "printenv CEC_MODEL")
+$machine_name = (shell "printenv MACHINE")
 $hb_machine = "unknown"
 if ($model == "p9_nimbus") {$hb_machine = "nimbus"}
 if ($model == "p9zz_1s2u") {$hb_machine = "zztop"}
-if ($model == "p9_cumulus") {$hb_machine = "cumulus"}
+if ($model == "p9_cumulus") {
+    if ($machine_name == "CUMULUS_CDIMM") { $hb_machine = "cumulus_cdimm" }
+    if ($machine_name != "CUMULUS_CDIMM") { $hb_machine = "cumulus" }
+}
 python "os.environ['HB_MACHINE'] = \""+$hb_machine+"\""
 echo "HB_MACHINE is: "+$hb_machine
 
diff --git a/src/usr/targeting/common/xmltohb/common.mk b/src/usr/targeting/common/xmltohb/common.mk
index 525ba5a37..7b3b8dd90 100755
--- a/src/usr/targeting/common/xmltohb/common.mk
+++ b/src/usr/targeting/common/xmltohb/common.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2017
+# Contributors Listed Below - COPYRIGHT 2012,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -52,6 +52,7 @@ XMLTOHB_SYSTEM_BINARIES += vbu_NIMBUS_targeting.bin
 XMLTOHB_SYSTEM_BINARIES += simics_NIMBUS_targeting.bin
 
 XMLTOHB_SYSTEM_BINARIES += simics_CUMULUS_targeting.bin
+XMLTOHB_SYSTEM_BINARIES += simics_CUMULUS_CDIMM_targeting.bin
 
 XMLTOHB_TARGETS += ${XMLTOHB_HEADER_TARGETS}
 XMLTOHB_TARGETS += ${XMLTOHB_SOURCE_TARGETS}
diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.mrw.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.mrw.xml
new file mode 100644
index 000000000..3428e5579
--- /dev/null
+++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.mrw.xml
@@ -0,0 +1,24 @@
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.mrw.xml $ -->
+<!--                                                                        -->
+<!-- OpenPOWER HostBoot Project                                             -->
+<!--                                                                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2018                             -->
+<!-- [+] International Business Machines Corp.                              -->
+<!--                                                                        -->
+<!--                                                                        -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License");        -->
+<!-- you may not use this file except in compliance with the License.       -->
+<!-- You may obtain a copy of the License at                                -->
+<!--                                                                        -->
+<!--     http://www.apache.org/licenses/LICENSE-2.0                         -->
+<!--                                                                        -->
+<!-- Unless required by applicable law or agreed to in writing, software    -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS,      -->
+<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        -->
+<!-- implied. See the License for the specific language governing           -->
+<!-- permissions and limitations under the License.                         -->
+<!--                                                                        -->
+<!-- IBM_PROLOG_END_TAG                                                     -->
diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile
index ffe66821f..e4d3f0904 100755
--- a/src/usr/targeting/xmltohb/makefile
+++ b/src/usr/targeting/xmltohb/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2011,2017
+# Contributors Listed Below - COPYRIGHT 2011,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -193,6 +193,9 @@ XMLTOHB_SYSTEM_BINARIES += simics_NIMBUS_targeting.bin.unprotected
 XMLTOHB_SYSTEM_BINARIES += simics_CUMULUS_targeting.bin.protected
 XMLTOHB_SYSTEM_BINARIES += simics_CUMULUS_targeting.bin.unprotected
 
+XMLTOHB_SYSTEM_BINARIES += simics_CUMULUS_CDIMM_targeting.bin.protected
+XMLTOHB_SYSTEM_BINARIES += simics_CUMULUS_CDIMM_targeting.bin.unprotected
+
 #debug :
 #	@echo COMMON_TARGETING_PATH_PREFIX = ${COMMON_TARGETING_PATH_PREFIX}
 #	@echo COMMON_TARGETING_REL_PATH = ${COMMON_TARGETING_REL_PATH}