summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrem Shanker Jha <premjha2@in.ibm.com>2018-03-08 12:42:19 -0600
committerhostboot <hostboot@us.ibm.com>2018-04-14 07:10:48 -0500
commitb8dc4d16a9c40a983b4fcd05d52f92e8ea30c687 (patch)
tree87c0fb7890b5cbf53b7c552f982a151b2af7acd5
parent3c778fd87860c94400ccef907697688fa7940bd0 (diff)
downloadtalos-hcode-b8dc4d16a9c40a983b4fcd05d52f92e8ea30c687.tar.gz
talos-hcode-b8dc4d16a9c40a983b4fcd05d52f92e8ea30c687.zip
Self Restore: Integrated build with rest of the EKB build flow.
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: I61dcfa0b81db05dd1036ffad3f72bed443affca7 Original-Change-Id: I68b2587eab2798b7b8a2a188187767fa53aaf12f Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/55259 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Cronus HW CI <cronushw-ci+hostboot@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>
-rw-r--r--import/chips/p9/procedures/ppe_closed/cme/cme_p9c10.mk4
-rw-r--r--import/chips/p9/procedures/ppe_closed/cme/cme_p9c11.mk4
-rw-r--r--import/chips/p9/procedures/ppe_closed/cme/cme_p9n20.mk2
-rw-r--r--import/chips/p9/procedures/ppe_closed/cme/cme_p9n21.mk4
-rw-r--r--import/chips/p9/procedures/ppe_closed/cme/cme_p9n22.mk4
5 files changed, 13 insertions, 5 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
index 1876200a..68860e53 100644
--- a/import/chips/p9/procedures/ppe_closed/cme/cme_p9c10.mk
+++ b/import/chips/p9/procedures/ppe_closed/cme/cme_p9c10.mk
@@ -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
index 75e7efdd..d3b5ce94 100644
--- a/import/chips/p9/procedures/ppe_closed/cme/cme_p9c11.mk
+++ b/import/chips/p9/procedures/ppe_closed/cme/cme_p9c11.mk
@@ -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_p9n20.mk b/import/chips/p9/procedures/ppe_closed/cme/cme_p9n20.mk
index 656b357e..a52348c4 100644
--- 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)/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
index 59f2cc86..1e5755c9 100644
--- a/import/chips/p9/procedures/ppe_closed/cme/cme_p9n21.mk
+++ b/import/chips/p9/procedures/ppe_closed/cme/cme_p9n21.mk
@@ -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
index f2b8afc6..b051e6c0 100644
--- a/import/chips/p9/procedures/ppe_closed/cme/cme_p9n22.mk
+++ b/import/chips/p9/procedures/ppe_closed/cme/cme_p9n22.mk
@@ -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)
OpenPOWER on IntegriCloud