summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory S. Still <stillgs@us.ibm.com>2018-06-21 10:01:43 -0400
committerhostboot <hostboot@us.ibm.com>2019-02-04 10:49:50 -0600
commita6f1075b895564541da772110ea5ca0b4abc1514 (patch)
tree1bb4e6f6cf454780edf603900dae9fec09fd1275
parent1d9d13289fa9b858296aaf7fc66928e2ad240552 (diff)
downloadtalos-hcode-a6f1075b895564541da772110ea5ca0b4abc1514.tar.gz
talos-hcode-a6f1075b895564541da772110ea5ca0b4abc1514.zip
Revert "Self Restore: Integrated support for build of self-restore code in EKB."
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>
-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_p9n10.mk2
-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
6 files changed, 6 insertions, 14 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 b88dec3e..57e9d47f 100644
--- 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
index 02ade373..fdd88956 100644
--- 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
index 807513c3..a633ed9e 100644
--- 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
index 8a77d4fa..5744b18d 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)/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
index 0dadefb8..9a9f3c9e 100644
--- 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
index 8d08f74f..67f12a45 100644
--- 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)
OpenPOWER on IntegriCloud