diff options
| author | Richard J. Knight <rjknight@us.ibm.com> | 2016-05-05 09:46:53 -0500 |
|---|---|---|
| committer | Joshua Hunsberger <jahunsbe@us.ibm.com> | 2017-10-23 16:03:48 -0500 |
| commit | 527cc7d15cc2cffd48a969dc7c34a2c1d262e0f2 (patch) | |
| tree | 646c2b86e0e183180c9261f874c6b9d1004b0437 /import/tools/imageProcs | |
| parent | 9eabb404c415ae80a089a3113ed2cee892c90eb3 (diff) | |
| download | talos-hcode-527cc7d15cc2cffd48a969dc7c34a2c1d262e0f2.tar.gz talos-hcode-527cc7d15cc2cffd48a969dc7c34a2c1d262e0f2.zip | |
Add CME image to hw_image
-Use new make recipes to create cme sub image
-Modify .mk file to include actual cme hcode.
-Resolved parallel build issues related to xip tool
operations
Change-Id: I31b9d871a66fcae10760f298cacfe1bd5d9bc080
RTC:152666
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24330
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/cme_image.mk | 15 | ||||
| -rw-r--r-- | import/tools/imageProcs/restore_image.mk | 6 | ||||
| -rw-r--r-- | import/tools/imageProcs/sgpe_image.mk | 3 |
3 files changed, 19 insertions, 5 deletions
diff --git a/import/tools/imageProcs/cme_image.mk b/import/tools/imageProcs/cme_image.mk index a296132b..3cb2f18a 100644 --- a/import/tools/imageProcs/cme_image.mk +++ b/import/tools/imageProcs/cme_image.mk @@ -24,7 +24,18 @@ # IBM_PROLOG_END_TAG IMAGE=cme_image -CME_IMAGE_DEPS=$$($(IMAGE)_PATH)/.cme_image.normalize.bin.built -$(call APPEND_EMPTY_SECTION,hcode,1024,$(CME_IMAGE_DEPS)) +# before appending the various sectoins of the xip image +# we need to wait until the raw xxx_image.bin and the +# various sub images are finished - add a dependancy on both below +CME_BIN_FILE=$(IMAGEPATH)/cme/cme.bin + +# adding the build user name is the last thing done to the +# raw cem_image.bin file before we append sections +CME_IMAGE_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_user + +CME_IMAGE_DEPS+= $(CME_BIN_FILE) + +$(call XIP_TOOL,append,.hcode,$(CME_IMAGE_DEPS),$(CME_BIN_FILE)) +$(call XIP_TOOL,report,,$$($(IMAGE)_PATH)/.$(IMAGE).append.hcode) $(call BUILD_XIPIMAGE) diff --git a/import/tools/imageProcs/restore_image.mk b/import/tools/imageProcs/restore_image.mk index e41b929a..905c3cbc 100644 --- a/import/tools/imageProcs/restore_image.mk +++ b/import/tools/imageProcs/restore_image.mk @@ -24,10 +24,12 @@ # IBM_PROLOG_END_TAG 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)/.restore_image.normalize.bin.built +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,,) $(call BUILD_XIPIMAGE) diff --git a/import/tools/imageProcs/sgpe_image.mk b/import/tools/imageProcs/sgpe_image.mk index dd5b0a38..674c9c59 100644 --- a/import/tools/imageProcs/sgpe_image.mk +++ b/import/tools/imageProcs/sgpe_image.mk @@ -24,10 +24,11 @@ # IBM_PROLOG_END_TAG IMAGE=sgpe_image -STOP_GPE_DEPS=$$($(IMAGE)_PATH)/.sgpe_image.normalize.bin.built +STOP_GPE_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_user $(call APPEND_EMPTY_SECTION,qpmr,1024,$(STOP_GPE_DEPS)) $(call APPEND_EMPTY_SECTION,lvl1_bl,1024,$$($(IMAGE)_PATH)/.$(IMAGE).append.qpmr) $(call APPEND_EMPTY_SECTION,lvl2_bl,1024,$$($(IMAGE)_PATH)/.$(IMAGE).append.lvl1_bl) $(call APPEND_EMPTY_SECTION,hcode,1024,$$($(IMAGE)_PATH)/.$(IMAGE).append.lvl2_bl) +$(call XIP_TOOL,,report,$$($(IMAGE)_PATH)/.$(IMAGE).append.hcode,) $(call BUILD_XIPIMAGE) |
