diff options
| author | Richard J. Knight <rjknight@us.ibm.com> | 2018-03-28 12:17:59 -0500 |
|---|---|---|
| committer | Richard J. Knight <rjknight@us.ibm.com> | 2018-03-28 12:17:59 -0500 |
| commit | f830e624a4b64185271db76c67739d3b468fd728 (patch) | |
| tree | 3f3eaee1f09932bf2106e9bf32644ef17bf87054 /tools/imageProcs | |
| parent | b5cf4e13e1964a85d6fd27f451663da7770529ce (diff) | |
| download | talos-hcode-f830e624a4b64185271db76c67739d3b468fd728.tar.gz talos-hcode-f830e624a4b64185271db76c67739d3b468fd728.zip | |
Use ring files from op-build/hostboot-binaries
-The ring data files have been moved from the hcode repo
into the hostboot-binaries repo with the other binary
data files. This commit removes the data files
from the hcode repo and updates the hw image
makefile to pick up the data from the location
pointed to by the variable $(RINGFILEPATH)
Change-Id: Id48026fecbfd26de97b20e9777e963bcca714356
Diffstat (limited to 'tools/imageProcs')
| -rw-r--r-- | tools/imageProcs/hw_image.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/imageProcs/hw_image.mk b/tools/imageProcs/hw_image.mk index d5c2505d..0281aecb 100644 --- a/tools/imageProcs/hw_image.mk +++ b/tools/imageProcs/hw_image.mk @@ -33,25 +33,27 @@ HW_IMAGE_VERSION:= $(shell cat $(ROOTPATH)/../tools/build/release_tag.txt) #$1 == type #$2 == chipId define BUILD_HW_IMAGE +$(eval RINGFILEPATH?=$(GENPATH)/rings/$1) $(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) $(eval hw_image_COMMONFLAGS += -I$(ROOTPATH)/chips/p9/xip/) +# files to be appended to image $(eval $(IMAGE)_FILE_SGPE = $(IMAGEPATH)/sgpe_image/$2.sgpe_image.bin) $(eval $(IMAGE)_FILE_RESTORE = $(IMAGEPATH)/restore_image/$2.restore_image.bin) $(eval $(IMAGE)_FILE_CME = $(IMAGEPATH)/cme_image/$2.cme_image.bin) $(eval $(IMAGE)_FILE_PSTATE = $(IMAGEPATH)/pstate_gpe_image/$2.pstate_gpe_image.bin) $(eval $(IMAGE)_FILE_IOPPE = $(IMAGEPATH)/ioppe_image/$2.ioppe_image.bin) -$(eval $(IMAGE)_FILE_RINGS = $(GENPATH)/rings/$1/$2.$1.rings.bin) -$(eval $(IMAGE)_FILE_OVERLAYS= $(GENPATH)/rings/$1/$2.$1.overlays.bin) +$(eval $(IMAGE)_FILE_RINGS = $(RINGFILEPATH)/$2.$1.rings.bin) +$(eval $(IMAGE)_FILE_OVERLAYS= $(RINGFILEPATH)/$2.$1.overlays.bin) # dependencies for appending image sections in sequence $(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,7 +72,6 @@ $(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))) |
