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

Self restore binary used to get built by a shell script standalone. It used to get checked in to EKB. Hardware image build infrastructure used to just pick that binary and insert it into the hardware image. This commit augments the EKB build flow by incorporating a capability to build self restore binary like any other executable generated during EKB build. Syntax to build binary: ekb build p9_core_restore_routines Key_Cronus_Test=PM_REGRESS Change-Id: Ia99f9d4cd8e98aadbe889e852f5a2e111ae66ba3 Original-Change-Id: Ifdcf31df6ceded564222f6962d94a3459072a3d3 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57345 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Cronus HW CI <cronushw-ci+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Kahn C. Evans <kahnevan@us.ibm.com> Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com> Reviewed-by: Richard J. Knight <rjknight@us.ibm.com> Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
open-power · Feb 4, 2019 · 1d9d132 · 1d9d132
1 parent 09387cb
commit 1d9d132
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/import/chips/p9/procedures/ppe_closed/cme/cme_p9c10.mk b/import/chips/p9/procedures/ppe_closed/cme/cme_p9c10.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HCODE Project
 #
-# COPYRIGHT 2016,2018
+# COPYRIGHT 2016,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -79,4 +79,6 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\
         $(ROOTPATH)/chips/p9/utils/imageProcs/ \
 	)
 
- $(call BUILD_BINHEADER,$(IMAGEPATH)/$(CME_TARGET)/$(CME_TARGET).bin,$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)
+ $(call BUILD_BINHEADER,\
+ $(IMAGEPATH)/$(CME_TARGET)/$(CME_TARGET).bin,\
+ $(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.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
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HCODE Project
 #
-# COPYRIGHT 2016,2018
+# COPYRIGHT 2016,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -79,4 +79,6 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\
         $(ROOTPATH)/chips/p9/utils/imageProcs/ \
 	)
 
- $(call BUILD_BINHEADER,$(IMAGEPATH)/$(CME_TARGET)/$(CME_TARGET).bin,$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)
+ $(call BUILD_BINHEADER,\
+ $(IMAGEPATH)/$(CME_TARGET)/$(CME_TARGET).bin,\
+ $(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.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
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HCODE Project
 #
-# COPYRIGHT 2016,2018
+# COPYRIGHT 2016,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -79,4 +79,4 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\
 
 $(call BUILD_BINHEADER, \
 	$(IMAGEPATH)/$(CME_TARGET)/$(CME_TARGET).bin, \
-	$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)
+	$(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.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
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HCODE Project
 #
-# COPYRIGHT 2016,2018
+# COPYRIGHT 2016,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -79,4 +79,4 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\
 
  $(call BUILD_BINHEADER, \
 	$(IMAGEPATH)/$(CME_IMAGE)/$(CME_IMAGE).bin, \
-	$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)
+	$(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.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
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HCODE Project
 #
-# COPYRIGHT 2017,2018
+# COPYRIGHT 2017,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -80,4 +80,6 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\
         $(ROOTPATH)/chips/p9/utils/imageProcs/ \
 	)
 
- $(call BUILD_BINHEADER,$(IMAGEPATH)/$(CME_IMAGE)/$(CME_IMAGE).bin,$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)
+ $(call BUILD_BINHEADER, \
+	$(IMAGEPATH)/$(CME_IMAGE)/$(CME_IMAGE).bin, \
+	$(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.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
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HCODE Project
 #
-# COPYRIGHT 2017,2018
+# COPYRIGHT 2017,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -80,4 +80,6 @@ $(call ADD_BINHEADER_INCDIR,$(IMAGE),\
         $(ROOTPATH)/chips/p9/utils/imageProcs/ \
 	)
 
- $(call BUILD_BINHEADER,$(IMAGEPATH)/$(CME_IMAGE)/$(CME_IMAGE).bin,$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)
+ $(call BUILD_BINHEADER, \
+	$(IMAGEPATH)/$(CME_IMAGE)/$(CME_IMAGE).bin, \
+	$(ROOTPATH)/output/images/utils/stopreg/p9_core_restore_routines/p9_core_restore_routines.bin)