Remove P8 simics targets

Removed all references to the P8 simics configs to speed
up build time and remove clutter.

Change-Id: Ibaa69ad674c82f7247b451c0df6ef253a61078fa
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24312
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Elizabeth Liner <eliner@us.ibm.com>
Reviewed-by: Christian Geddes <crgeddes@us.ibm.com>

4 files changed, 6 insertions, 58 deletions

diff --git a/src/build/buildpnor/makefile b/src/build/buildpnor/makefile
index 748711761..bfa9302bb 100644
--- a/src/build/buildpnor/makefile
+++ b/src/build/buildpnor/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2015
+# Contributors Listed Below - COPYRIGHT 2012,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -42,7 +42,7 @@ ROOTPATH = ../../..
 .DEFAULT_GOAL := buildpnor
 
 
-PNOR_VBU_TARGETS = vbu_MURANO vbu_VENICE
+PNOR_VBU_TARGETS = vbu_NIMBUS
 
 define PNOR_vbu_template
 $${IMGDIR}/$(1).pnor: $${IMGDIR}/hbicore_extended.bin $${IMGDIR}/$(1)_targeting.bin
diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index 2edbf1652..5852c1158 100644
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -102,9 +102,7 @@ COPY_RENAME_FILES = \
     img/hostboot.bin:img/hbicore$(UNDERSCORE_TEST).bin:fsp,openpower \
     img/hostboot_extended.bin:img/hbicore$(UNDERSCORE_TEST)_extended.bin:fsp,openpower \
     img/hostboot_runtime.bin:img/hbirt$(UNDERSCORE_TEST).bin:fsp,openpower \
-    vbu_MURANO.pnor:img/vbu$(UNDERSCORE_TEST)_MURANO.pnor:vpo \
-    vbu_VENICE.pnor:img/vbu$(UNDERSCORE_TEST)_VENICE.pnor:vpo \
-    vbu_NAPLES.pnor:img/vbu$(UNDERSCORE_TEST)_NAPLES.pnor:vpo \
+    vbu_NIMBUS.pnor:img/vbu$(UNDERSCORE_TEST)_NIMBUS.pnor:vpo \
     hbicore.syms:img/hbicore$(UNDERSCORE_TEST).syms:tools,vpo,openpower \
     hbicore.list.bz2:img/hbicore$(UNDERSCORE_TEST).list.bz2:tools,vpo,openpower \
     hbicore.bin.modinfo:img/hbicore$(UNDERSCORE_TEST).bin.modinfo:tools,vpo,openpower \
@@ -206,9 +204,6 @@ fsp.tar_CONTENTS = \
     src/build/buildpnor/buildpnor.pl \
     src/build/buildpnor/defaultPnorLayout.xml \
     $(if $(FAKEPNOR), src/build/buildpnor/pnorLayoutFake.xml, ) \
-    img/simics_MURANO_targeting.bin \
-    img/simics_VENICE_targeting.bin \
-    img/simics_NAPLES_targeting.bin \
     img/simics_NIMBUS_targeting.bin \
     $(addsuffix :targeting/,\
 	$(call ROOTPATH_WILDCARD_RECURSIVE,src/usr/targeting/common))\
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile
index ce23b3c08..fda6e44ac 100755
--- a/src/build/mkrules/hbfw/img/makefile
+++ b/src/build/mkrules/hbfw/img/makefile
@@ -256,34 +256,14 @@ HOSTBOOT_FAKEPNOR_SECTIONS = HBI=${EXT_FAKE_IMAGE},HBEL=${HBEL_IMAGE},MVPD=${MVP
 
 HBFW_OBJPATH = ${.PATH:M*obj*}
 ENGD_OBJPATH = ${HBFW_OBJPATH:S/hbfw\/img/engd\/href/g}
-MURANO_TARG_IMG = simics_MURANO_targeting.bin
-NAPLES_TARG_IMG = simics_NAPLES_targeting.bin
-VENICE_TARG_IMG = simics_VENICE_targeting.bin
 NIMBUS_TARG_IMG = simics_NIMBUS_targeting.bin
-MURANO_TARG_IMG_ECC = simics_MURANO_targeting.bin.ecc
-NAPLES_TARG_IMG_ECC = simics_NAPLES_targeting.bin.ecc
-VENICE_TARG_IMG_ECC = simics_VENICE_targeting.bin.ecc
 NIMBUS_TARG_IMG_ECC = simics_NIMBUS_targeting.bin.ecc
 NIMBUS_TARG_IMG_FAKE = simics_NIMBUS_targeting.bin.fake
-MURANO_SLW_IMG = ${ENGD_OBJPATH:Fs1.ref_image.hdr.bin}
-NAPLES_SLW_IMG = ${ENGD_OBJPATH:Fs1.ref_image.hdr.bin}
-VENICE_SLW_IMG = ${ENGD_OBJPATH:Fp8.ref_image.hdr.bin}
 NIMBUS_SLW_IMG = ${ENGD_OBJPATH:Fp8.ref_image.hdr.bin}
-MURANO_LOCAL_SLW_IMG = s1.ref_image.hdr.bin
-NAPLES_LOCAL_SLW_IMG = s1.ref_image.hdr.bin
-VENICE_LOCAL_SLW_IMG = p8.ref_image.hdr.bin
+#Using p8 images until we have something valid for p9...
 NIMBUS_LOCAL_SLW_IMG = p8.ref_image.hdr.bin
-MURANO_LOCAL_SLW_IMG_ECC = s1.ref_image.hdr.bin.ecc
-NAPLES_LOCAL_SLW_IMG_ECC = s1.ref_image.hdr.bin.ecc
-VENICE_LOCAL_SLW_IMG_ECC = p8.ref_image.hdr.bin.ecc
 NIMBUS_LOCAL_SLW_IMG_ECC = p8.ref_image.hdr.bin.ecc
-MURANO_SBE_IMG = s1SbePartition.bin
-NAPLES_SBE_IMG = s1SbePartition.bin
-VENICE_SBE_IMG = p8SbePartition.bin
 NIMBUS_SBE_IMG = p8SbePartition.bin
-MURANO_SBE_IMG_ECC = s1SbePartition.bin.ecc
-NAPLES_SBE_IMG_ECC = s1SbePartition.bin.ecc
-VENICE_SBE_IMG_ECC = p8SbePartition.bin.ecc
 NIMBUS_SBE_IMG_ECC = p8SbePartition.bin.ecc
 SBEC_IMG = centSbePartition.bin
 SBEC_IMG_ECC = centSbePartition.bin.ecc
@@ -291,47 +271,23 @@ TEMP_IMG = temp.bin
 
 inject_ecc: build_sbe_partitions
 	# cp file with full path to one with local path
-	cp ${MURANO_SLW_IMG} ${MURANO_LOCAL_SLW_IMG}
-	cp ${NAPLES_SLW_IMG} ${NAPLES_LOCAL_SLW_IMG}
-	cp ${VENICE_SLW_IMG} ${VENICE_LOCAL_SLW_IMG}
 	cp ${NIMBUS_SLW_IMG} ${NIMBUS_LOCAL_SLW_IMG}
 	# HBD partition
-	dd if=${${MURANO_TARG_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \
-	ecc --inject ${TEMP_IMG} --output ${MURANO_TARG_IMG_ECC} --p8; \
-	dd if=${${NAPLES_TARG_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \
-	ecc --inject ${TEMP_IMG} --output ${NAPLES_TARG_IMG_ECC} --p8; \
-	dd if=${${VENICE_TARG_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \
-	ecc --inject ${TEMP_IMG} --output ${VENICE_TARG_IMG_ECC} --p8; \
 	dd if=${${NIMBUS_TARG_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \
 	ecc --inject ${TEMP_IMG} --output ${NIMBUS_TARG_IMG_ECC} --p8; \
 	#for NIMBUS fake pnor skip version header
 	dd if=${${NIMBUS_TARG_IMG}:P} of=${NIMBUS_TARG_IMG_FAKE} ibs=4k count=32 skip=1 conv=sync; \
 	# SBE partition
-	dd if=${${MURANO_SBE_IMG}:P} of=${TEMP_IMG} ibs=256k conv=sync; \
-	ecc --inject ${TEMP_IMG} --output ${MURANO_SBE_IMG_ECC} --p8; \
-	dd if=${${NAPLES_SBE_IMG}:P} of=${TEMP_IMG} ibs=256k conv=sync; \
-	ecc --inject ${TEMP_IMG} --output ${NAPLES_SBE_IMG_ECC} --p8; \
-	dd if=${${VENICE_SBE_IMG}:P} of=${TEMP_IMG} ibs=256k conv=sync; \
-	ecc --inject ${TEMP_IMG} --output ${VENICE_SBE_IMG_ECC} --p8; \
 	dd if=${${NIMBUS_SBE_IMG}:P} of=${TEMP_IMG} ibs=256k conv=sync; \
 	ecc --inject ${TEMP_IMG} --output ${NIMBUS_SBE_IMG_ECC} --p8; \
 	# SBEC partition
 	dd if=${${SBEC_IMG}:P} of=${TEMP_IMG} ibs=512k conv=sync; \
 	ecc --inject ${TEMP_IMG} --output ${SBEC_IMG_ECC} --p8; \
 	# WINK partition
-	dd if=${${MURANO_LOCAL_SLW_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \
-	ecc --inject ${TEMP_IMG} --output ${MURANO_LOCAL_SLW_IMG_ECC} --p8; \
-	dd if=${${NAPLES_LOCAL_SLW_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \
-	ecc --inject ${TEMP_IMG} --output ${NAPLES_LOCAL_SLW_IMG_ECC} --p8; \
-	dd if=${${VENICE_LOCAL_SLW_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \
-	ecc --inject ${TEMP_IMG} --output ${VENICE_LOCAL_SLW_IMG_ECC} --p8; \
 	dd if=${${NIMBUS_LOCAL_SLW_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \
 	ecc --inject ${TEMP_IMG} --output ${NIMBUS_LOCAL_SLW_IMG_ECC} --p8; \
 	rm ${TEMP_IMG}
 
-MURANO_SECT = HBD=${MURANO_TARG_IMG_ECC},SBE=${MURANO_SBE_IMG_ECC},SBEC=${SBEC_IMG_ECC},WINK=${MURANO_LOCAL_SLW_IMG_ECC}
-NAPLES_SECT = HBD=${NAPLES_TARG_IMG_ECC},SBE=${NAPLES_SBE_IMG_ECC},SBEC=${SBEC_IMG_ECC},WINK=${NAPLES_LOCAL_SLW_IMG_ECC}
-VENICE_SECT = HBD=${VENICE_TARG_IMG_ECC},SBE=${VENICE_SBE_IMG_ECC},SBEC=${SBEC_IMG_ECC},WINK=${VENICE_LOCAL_SLW_IMG_ECC}
 NIMBUS_SECT = HBD=${NIMBUS_TARG_IMG_ECC},SBE=${NIMBUS_SBE_IMG_ECC},SBEC=${SBEC_IMG_ECC},WINK=${NIMBUS_LOCAL_SLW_IMG_ECC}
 FAKE_SECT = HBD=${NIMBUS_TARG_IMG_FAKE}
 
@@ -345,9 +301,6 @@ FAKE_SECT = HBD=${NIMBUS_TARG_IMG_FAKE}
 .endif
 
 PNOR_IMG_INFO = \
-   murano.pnor:defaultPnorLayout.xml:${MURANO_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
-   naples.pnor:defaultPnorLayout.xml:${NAPLES_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
-   venice.pnor:defaultPnorLayout.xml:${VENICE_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
    nimbus.pnor:defaultPnorLayout.xml:${NIMBUS_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
    ${FAKE_PNOR_IMG_INFO} \
    ${FIPS_PNOR_INFO}
diff --git a/src/build/tools/hb b/src/build/tools/hb
index 357653768..7865c4069 100755
--- a/src/build/tools/hb
+++ b/src/build/tools/hb
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2011,2015
+# Contributors Listed Below - COPYRIGHT 2011,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -142,7 +142,7 @@ hb_helptext()
         echo "  Requires the hostboot image to be 'prime'd into the workspace."
         echo
         echo "  Environment Variables:"
-        echo "      MACHINE: Alternate simics machine type (default VENICE)"
+        echo "      MACHINE: Alternate simics machine type (default NIMBUS)"
         echo "      SIMICSOPTIONS: Additional options to always pass to the"
         echo "                     start simics script, such as '-nre'."
         echo