Revert "Self Restore: Integrated support for build of self-restore code in EKB."

stillgs · op-jenkins · commit a6f1075b8955 · 2019-02-04T10:49:50.000-06:00
This reverts commit dcebd90d5d9518bfe9809dac395f8410d67f5ee6. Change-Id: I8c6f8cfcbdb947b58ad65c6ff32ee53763c02cb1 Original-Change-Id: I588f0798c0f1914e10f7aef218e9e377b12aa3c2 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61066 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
diff --git a/import/chips/p9/procedures/ppe_closed/cme/cme_p9c10.mk b/import/chips/p9/procedures/ppe_closed/cme/cme_p9c10.mk
@@ -79,6 +79,4 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\
         $(ROOTPATH)/chips/p9/utils/imageProcs/ \
 	)
 
- $(call BUILD_BINHEADER,\
- $(IMAGEPATH)/$(CME_TARGET)/$(CME_TARGET).bin,\
- $(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.bin)
+ $(call BUILD_BINHEADER,$(IMAGEPATH)/$(CME_TARGET)/$(CME_TARGET).bin,$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)
diff --git a/import/chips/p9/procedures/ppe_closed/cme/cme_p9c11.mk b/import/chips/p9/procedures/ppe_closed/cme/cme_p9c11.mk
@@ -79,6 +79,4 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\
         $(ROOTPATH)/chips/p9/utils/imageProcs/ \
 	)
 
- $(call BUILD_BINHEADER,\
- $(IMAGEPATH)/$(CME_TARGET)/$(CME_TARGET).bin,\
- $(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.bin)
+ $(call BUILD_BINHEADER,$(IMAGEPATH)/$(CME_TARGET)/$(CME_TARGET).bin,$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)
diff --git a/import/chips/p9/procedures/ppe_closed/cme/cme_p9n10.mk b/import/chips/p9/procedures/ppe_closed/cme/cme_p9n10.mk
@@ -79,4 +79,4 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\
 
 $(call BUILD_BINHEADER, \
 	$(IMAGEPATH)/$(CME_TARGET)/$(CME_TARGET).bin, \
-	$(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.bin)
+	$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)
diff --git a/import/chips/p9/procedures/ppe_closed/cme/cme_p9n20.mk b/import/chips/p9/procedures/ppe_closed/cme/cme_p9n20.mk
@@ -79,4 +79,4 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\
 
  $(call BUILD_BINHEADER, \
 	$(IMAGEPATH)/$(CME_IMAGE)/$(CME_IMAGE).bin, \
-	$(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.bin)
+	$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)
diff --git a/import/chips/p9/procedures/ppe_closed/cme/cme_p9n21.mk b/import/chips/p9/procedures/ppe_closed/cme/cme_p9n21.mk
@@ -80,6 +80,4 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\
         $(ROOTPATH)/chips/p9/utils/imageProcs/ \
 	)
 
- $(call BUILD_BINHEADER, \
-	$(IMAGEPATH)/$(CME_IMAGE)/$(CME_IMAGE).bin, \
-	$(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.bin)
+ $(call BUILD_BINHEADER,$(IMAGEPATH)/$(CME_IMAGE)/$(CME_IMAGE).bin,$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)
diff --git a/import/chips/p9/procedures/ppe_closed/cme/cme_p9n22.mk b/import/chips/p9/procedures/ppe_closed/cme/cme_p9n22.mk
@@ -80,6 +80,4 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\
         $(ROOTPATH)/chips/p9/utils/imageProcs/ \
 	)
 
- $(call BUILD_BINHEADER, \
-	$(IMAGEPATH)/$(CME_IMAGE)/$(CME_IMAGE).bin, \
-	$(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.bin)
+ $(call BUILD_BINHEADER,$(IMAGEPATH)/$(CME_IMAGE)/$(CME_IMAGE).bin,$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,4 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\`
`79`	`79`	`$(ROOTPATH)/chips/p9/utils/imageProcs/ \`
`80`	`80`	`)`
`81`	`81`
`82`		`- $(call BUILD_BINHEADER,\`
`83`		`- $(IMAGEPATH)/$(CME_TARGET)/$(CME_TARGET).bin,\`
`84`		`- $(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.bin)`
	`82`	`+ $(call BUILD_BINHEADER,$(IMAGEPATH)/$(CME_TARGET)/$(CME_TARGET).bin,$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,4 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\`
`80`	`80`	`$(ROOTPATH)/chips/p9/utils/imageProcs/ \`
`81`	`81`	`)`
`82`	`82`
`83`		`- $(call BUILD_BINHEADER, \`
`84`		`- $(IMAGEPATH)/$(CME_IMAGE)/$(CME_IMAGE).bin, \`
`85`		`- $(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.bin)`
	`83`	`+ $(call BUILD_BINHEADER,$(IMAGEPATH)/$(CME_IMAGE)/$(CME_IMAGE).bin,$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)`