diff options
| author | Richard J. Knight <rjknight@us.ibm.com> | 2016-05-27 12:36:55 -0500 |
|---|---|---|
| committer | Joshua Hunsberger <jahunsbe@us.ibm.com> | 2017-10-23 16:04:06 -0500 |
| commit | 5fef7b2ce35c19bccfdf93f69568a03b8d3dc594 (patch) | |
| tree | d1a8161e93dc7f8b90e027f8fc50d991feed8718 /import/tools | |
| parent | a4733ee474cc176c9c3b81d37079704057062e85 (diff) | |
| download | talos-hcode-5fef7b2ce35c19bccfdf93f69568a03b8d3dc594.tar.gz talos-hcode-5fef7b2ce35c19bccfdf93f69568a03b8d3dc594.zip | |
Add remaining sub images to hw_image
-Update pstate_gpe_image.mk to append the lvl1, lvl2
boot loader bin files to pgpe xip image.
-Update sgpe_image.mk to append the lvl1, lvl2
boot loader bin files to the sgpe xip image.
Change-Id: Iab04adb67d3d1bf204b9a39924aecf3433b83f7c
RTC:153726
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25132
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')
| -rw-r--r-- | import/tools/imageProcs/pstate_gpe_image.mk | 18 | ||||
| -rw-r--r-- | import/tools/imageProcs/sgpe_image.mk | 18 |
2 files changed, 24 insertions, 12 deletions
diff --git a/import/tools/imageProcs/pstate_gpe_image.mk b/import/tools/imageProcs/pstate_gpe_image.mk index 6e1fcd73..916962a8 100644 --- a/import/tools/imageProcs/pstate_gpe_image.mk +++ b/import/tools/imageProcs/pstate_gpe_image.mk @@ -24,14 +24,18 @@ # IBM_PROLOG_END_TAG IMAGE=pstate_gpe_image +# add dependency on the raw image.bin file completion +PGPE_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_user -#binary image file to add into the image +# dependencies for bin files needed in the pgpe xip image +LVL1_BL_BIN_FILE=$(IMAGEPATH)/pgpe_lvl1_copier/pgpe_lvl1_copier.bin +LVL2_BL_BIN_FILE=$(IMAGEPATH)/pgpe_lvl2_loader/pgpe_lvl2_loader.bin PGPE_BIN_FILE=$(IMAGEPATH)/pstate_gpe/pstate_gpe.bin -PGPE_IMAGE_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_user -PGPE_IMAGE_DEPS+= $(PGPE_BIN_FILE) - -$(call XIP_TOOL,append,.hcode,$(PGPE_IMAGE_DEPS),$(PGPE_BIN_FILE)) -$(call XIP_TOOL,report,,$$($(IMAGE)_PATH)/.$(IMAGE).append.hcode) - +$(call XIP_TOOL,append,.lvl1_bl,$(PGPE_DEPS) $(LVL1_BL_BIN_FILE), $(LVL1_BL_BIN_FILE)) +$(call XIP_TOOL,append,.lvl2_bl,$(PGPE_DEPS) $$($(IMAGE)_PATH)/.$(IMAGE).append.lvl1_bl \ + $(LVL2_BL_BIN_FILE), $(LVL2_BL_BIN_FILE)) +$(call XIP_TOOL,append,.hcode,$(PGPE_DEPS) $$($(IMAGE)_PATH)/.$(IMAGE).append.lvl2_bl \ + $(PGPE_BIN_FILE),$(PGPE_BIN_FILE)) +$(call XIP_TOOL,report,,$$($(IMAGE)_PATH)/.$(IMAGE).append.hcode,) $(call BUILD_XIPIMAGE) diff --git a/import/tools/imageProcs/sgpe_image.mk b/import/tools/imageProcs/sgpe_image.mk index 49681c01..756311cb 100644 --- a/import/tools/imageProcs/sgpe_image.mk +++ b/import/tools/imageProcs/sgpe_image.mk @@ -24,16 +24,24 @@ # IBM_PROLOG_END_TAG IMAGE=sgpe_image -# add dependency on the raw image.bin file +# add dependency on the raw image.bin file completion SGPE_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_user # dependencies for bin files needed in the sgpe xip image QPMR_BIN_FILE=$(IMAGEPATH)/qpmr_header/qpmr_header.bin +LVL1_BL_BIN_FILE=$(IMAGEPATH)/sgpe_lvl1_copier/sgpe_lvl1_copier.bin +LVL2_BL_BIN_FILE=$(IMAGEPATH)/sgpe_lvl2_loader/sgpe_lvl2_loader.bin SGPE_BIN_FILE=$(IMAGEPATH)/stop_gpe/stop_gpe.bin -$(call XIP_TOOL,append,.qpmr,$(SGPE_DEPS) $(QPMR_BIN_FILE) ,$(QPMR_BIN_FILE)) -$(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 XIP_TOOL,append,.hcode, $$($(IMAGE)_PATH)/.$(IMAGE).append.lvl2_bl $(SGPE_BIN_FILE),$(SGPE_BIN_FILE)) +SGPE_DEPS+=$(SGPE_BIN_FILE) +SGPE_DEPS+=$(LVL1_BL_BIN_FILE) +SGPE_DEPS+=$(LVL2_BL_BIN_FILE) + +SGPE_DEPS+=$(QPMR_BIN_FILE) + +$(call XIP_TOOL,append,.qpmr,$(SGPE_DEPS) ,$(QPMR_BIN_FILE)) +$(call XIP_TOOL,append,.lvl1_bl,$(SGPE_DEPS) $$($(IMAGE)_PATH)/.$(IMAGE).append.qpmr, $(LVL1_BL_BIN_FILE)) +$(call XIP_TOOL,append,.lvl2_bl,$(SGPE_DEPS) $$($(IMAGE)_PATH)/.$(IMAGE).append.lvl1_bl, $(LVL2_BL_BIN_FILE)) +$(call XIP_TOOL,append,.hcode,$(SGPE_DEPS) $$($(IMAGE)_PATH)/.$(IMAGE).append.lvl2_bl ,$(SGPE_BIN_FILE)) $(call XIP_TOOL,report,,$$($(IMAGE)_PATH)/.$(IMAGE).append.hcode) $(call BUILD_XIPIMAGE) |
