diff options
| author | Richard J. Knight <rjknight@us.ibm.com> | 2016-05-27 11:21:18 -0500 |
|---|---|---|
| committer | Joshua Hunsberger <jahunsbe@us.ibm.com> | 2017-10-23 16:03:56 -0500 |
| commit | 57faae640a3493f7d08938f7dd4757baa069cf36 (patch) | |
| tree | 54d3b446837bd367fa8b2f875f5c220acd0461a3 /import/tools/imageProcs | |
| parent | f82d40e46e3555cc15e35281727d61681bd4b9e7 (diff) | |
| download | talos-hcode-57faae640a3493f7d08938f7dd4757baa069cf36.tar.gz talos-hcode-57faae640a3493f7d08938f7dd4757baa069cf36.zip | |
Add restore image to hw image
-Auto generate cpmr_header image
-Stitch together SelfRestore image parts into an XIP image
Change-Id: Idd2e6c9020c200873544710bb4418e472230936b
RTC:152668
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24346
Tested-by: Jenkins Server
Reviewed-by: Claus M. Olsen <cmolsen@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Diffstat (limited to 'import/tools/imageProcs')
| -rw-r--r-- | import/tools/imageProcs/restore_image.mk | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/import/tools/imageProcs/restore_image.mk b/import/tools/imageProcs/restore_image.mk index 905c3cbc..2130d9aa 100644 --- a/import/tools/imageProcs/restore_image.mk +++ b/import/tools/imageProcs/restore_image.mk @@ -26,10 +26,20 @@ IMAGE=restore_image # create dependency on the restore image hcode and the final step in the # raw image.bin creation -SELF_REST_TARGET=$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin - SELF_REST_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_user -$(call XIP_TOOL,append,.self_restore,$(SELF_REST_DEPS),$(SELF_REST_TARGET)) -$(call XIP_TOOL,report,,$$($(IMAGE)_PATH)/.$(IMAGE).append.self_restore,,) +SELF_RESTORE_BIN=$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin +CPRM_HEADER_BIN=$(IMAGEPATH)/cpmr_header/cpmr_header.bin + +# apending the cpmr header is also dependent on the raw image being complete +CPMR_HEADER_DEPS=$(SELF_REST_DEPS) +CPMR_HEADER_DEPS+=$(CPRM_HEADER_BIN) + +# make sure we append the restore image after the cpmr header +SELF_RESTORE_DEPS+=$$($(IMAGE)_PATH)/.restore_image.append.cpmr + +$(call XIP_TOOL,append,.cpmr,$(CPMR_HEADER_DEPS),$(CPRM_HEADER_BIN)) +$(call XIP_TOOL,append,.self_restore,$(SELF_RESTORE_DEPS),$(SELF_RESTORE_BIN)) +$(call XIP_TOOL,report,,$$($(IMAGE)_PATH)/.$(IMAGE).append.self_restore) + $(call BUILD_XIPIMAGE) |
