diff options
| author | Richard J. Knight <rjknight@us.ibm.com> | 2017-10-24 21:59:23 -0500 |
|---|---|---|
| committer | Richard J. Knight <rjknight@us.ibm.com> | 2017-10-26 07:31:16 -0500 |
| commit | fe29bbc44166f5319d1cfd5ca74aede3a9893363 (patch) | |
| tree | 276e97edd94dd3fcf1276aa4fd098ecc5e6f82bc /tools/imageProcs | |
| parent | dcd886dc34a42fb80f046156f075d396c6467a63 (diff) | |
| download | talos-hcode-fe29bbc44166f5319d1cfd5ca74aede3a9893363.tar.gz talos-hcode-fe29bbc44166f5319d1cfd5ca74aede3a9893363.zip | |
Build tag not displayed in generated hw_image report file
-Udpate hw_image.mk to apply build tag before report is
generated
Change-Id: Idcc72eb03602d4fd28138cdb7c294d579a7d867b
Diffstat (limited to 'tools/imageProcs')
| -rw-r--r-- | tools/imageProcs/hw_image.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/imageProcs/hw_image.mk b/tools/imageProcs/hw_image.mk index 8c9ac6cc..b973b7f7 100644 --- a/tools/imageProcs/hw_image.mk +++ b/tools/imageProcs/hw_image.mk @@ -25,6 +25,8 @@ MAX_SBE_RING_SECTION_SIZE ?= 25600 +HW_IMAGE_VERSION:= $(shell cat $(ROOTPATH)/../tools/build/release_tag.txt) + #depend on the completion of the base hw_image #binfiles to add to the hw_image #various image dependencies to serialize hw_image creation @@ -33,7 +35,6 @@ MAX_SBE_RING_SECTION_SIZE ?= 25600 define BUILD_HW_IMAGE $(eval IMAGE=$2.$1_image) - $(eval $(IMAGE)_PATH=$(IMAGEPATH)/hw_image) $(eval $(IMAGE)_LINK_SCRIPT=hw_image.cmd) $(eval $(IMAGE)_LAYOUT=$(IMAGEPATH)/hw_image/hw_image.o) @@ -51,7 +52,6 @@ $(eval $(IMAGE)_FILE_OVERLAYS= $(GENPATH)/rings/$1/$2.$1.overlays.bin) $(eval $(IMAGE)_DEPS_SGPE =$(IMAGEPATH)/sgpe_image/.$2.sgpe_image.bin.built) $(eval $(IMAGE)_DEPS_SGPE+=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_host) - $(eval $(IMAGE)_DEPS_RESTORE =$(IMAGEPATH)/restore_image/.$2.restore_image.bin.built) $(eval $(IMAGE)_DEPS_RESTORE+=$$($(IMAGE)_PATH)/.$(IMAGE).append.sgpe) @@ -70,6 +70,7 @@ $(eval $(IMAGE)_DEPS_RINGS+=$$($(IMAGE)_PATH)/.$(IMAGE).append.ioppe) $(eval $(IMAGE)_DEPS_OVERLAYS = $$($(IMAGE)_FILE_OVERLAYS)) $(eval $(IMAGE)_DEPS_OVERLAYS+= $$($(IMAGE)_PATH)/.$(IMAGE).append.rings) + # image build using all files and serialised by dependencies $(eval $(call XIP_TOOL,append,.sgpe,$$($(IMAGE)_DEPS_SGPE),$$($(IMAGE)_FILE_SGPE))) $(eval $(call XIP_TOOL,append,.core_restore,$$($(IMAGE)_DEPS_RESTORE),$$($(IMAGE)_FILE_RESTORE))) @@ -77,12 +78,16 @@ $(eval $(call XIP_TOOL,append,.cme,$$($(IMAGE)_DEPS_CME),$$($(IMAGE)_FILE_CME))) $(eval $(call XIP_TOOL,append,.pgpe,$$($(IMAGE)_DEPS_PSTATE),$$($(IMAGE)_FILE_PSTATE))) $(eval $(call XIP_TOOL,append,.ioppe,$$($(IMAGE)_DEPS_IOPPE),$$($(IMAGE)_FILE_IOPPE))) - $(eval $(call XIP_TOOL,append,.rings,$$($(IMAGE)_DEPS_RINGS),$$($(IMAGE)_FILE_RINGS))) $(eval $(call XIP_TOOL,append,.overlays,$$($(IMAGE)_DEPS_OVERLAYS), $$($(IMAGE)_FILE_OVERLAYS) 1)) -$(eval $(call XIP_TOOL,report,,$$($(IMAGE)_PATH)/.$(IMAGE).append.overlays)) +$(eval $(call XIP_TOOL,set,build_tag,$$($(IMAGE)_PATH)/.$(IMAGE).append.overlays, $(HW_IMAGE_VERSION))) + +$(eval $(call XIP_TOOL,report,,$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_tag)) + +$(eval $(foreach ec, $($(2)_EC),\ + $(eval $(call VERIFY_SBE_RING_SECTION, 0x$(ec), $(MAX_SBE_RING_SECTION_SIZE),$(ec))))) $(eval $(call BUILD_XIPIMAGE)) endef |
