CME/SGPE/PGPE/Restore Image Build: pick up per-chip/EC level files

introduces a new image build macro that is an easy-to-use wrapper
for the p9_dd_container_tool, which is the base for this support

calls new macro in various XIP sub-image build flows to generate
DD level containers for some section content, and picks these
files up in XIP image build flows

DD level specific files to be handled include HCODE for CME/SGPE/PGPE
and CPMR/PPMR/QPMR headers.

Change-Id: Ia78e99bfa508cbddcb6599ef0c980deca0993d66
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39590
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>

4 files changed, 26 insertions, 12 deletions

diff --git a/import/tools/imageProcs/cme_image.mk b/import/tools/imageProcs/cme_image.mk
index 34e19410..ecaed1aa 100644
--- a/import/tools/imageProcs/cme_image.mk
+++ b/import/tools/imageProcs/cme_image.mk
@@ -32,8 +32,11 @@ $(eval $(IMAGE)_LINK_SCRIPT=cme_image.cmd)
 $(eval $(IMAGE)_LAYOUT=$(IMAGEPATH)/cme_image/cme_image.o)
 $(eval cme_image_COMMONFLAGS += -I$(ROOTPATH)/chips/p9/xip/)
 
+# files with multiple DD level content to be generated
+$(eval $(call BUILD_DD_LEVEL_CONTAINER,$1,cme))
+
 # files to be appended to image
-$(eval $(IMAGE)_FILE_HCODE=$(IMAGEPATH)/cme/cme.bin)
+$(eval $(IMAGE)_FILE_HCODE=$$($(IMAGE)_DD_CONT_cme))
 
 # dependencies for appending image sections in sequence:
 # - file to be appended
@@ -46,7 +49,7 @@ $(eval $(IMAGE)_DEPS_REPORT =$$($(IMAGE)_DEPS_HCODE))
 $(eval $(IMAGE)_DEPS_REPORT+=$$($(IMAGE)_PATH)/.$(IMAGE).append.hcode)
 
 # image build using all files and serialised by dependencies
-$(eval $(call XIP_TOOL,append,.hcode,$$($(IMAGE)_DEPS_HCODE),$$($(IMAGE)_FILE_HCODE)))
+$(eval $(call XIP_TOOL,append,.hcode,$$($(IMAGE)_DEPS_HCODE),$$($(IMAGE)_FILE_HCODE) 1))
 
 # create image report for image with all files appended
 $(eval $(call XIP_TOOL,report,,$$($(IMAGE)_DEPS_REPORT)))
diff --git a/import/tools/imageProcs/pstate_gpe_image.mk b/import/tools/imageProcs/pstate_gpe_image.mk
index 541b3cf7..020b8b9c 100644
--- a/import/tools/imageProcs/pstate_gpe_image.mk
+++ b/import/tools/imageProcs/pstate_gpe_image.mk
@@ -32,11 +32,15 @@ $(eval $(IMAGE)_LINK_SCRIPT=pstate_gpe_image.cmd)
 $(eval $(IMAGE)_LAYOUT=$(IMAGEPATH)/pstate_gpe_image/pstate_gpe_image.o)
 $(eval pstate_gpe_image_COMMONFLAGS += -I$(ROOTPATH)/chips/p9/xip/)
 
+# files with multiple DD level content to be generated
+$(eval $(call BUILD_DD_LEVEL_CONTAINER,$1,ppmr_header))
+$(eval $(call BUILD_DD_LEVEL_CONTAINER,$1,pstate_gpe))
+
 # files to be appended to image
-$(eval $(IMAGE)_FILE_PPMR_HDR=$(IMAGEPATH)/ppmr_header/ppmr_header.bin)
+$(eval $(IMAGE)_FILE_PPMR_HDR=$$($(IMAGE)_DD_CONT_ppmr_header))
 $(eval $(IMAGE)_FILE_LVL1_BL=$(IMAGEPATH)/pgpe_lvl1_copier/pgpe_lvl1_copier.bin)
 $(eval $(IMAGE)_FILE_LVL2_BL=$(IMAGEPATH)/pgpe_lvl2_loader/pgpe_lvl2_loader.bin)
-$(eval $(IMAGE)_FILE_HCODE=$(IMAGEPATH)/pstate_gpe/pstate_gpe.bin)
+$(eval $(IMAGE)_FILE_HCODE=$$($(IMAGE)_DD_CONT_pstate_gpe))
 
 # dependencies for appending image sections in sequence:
 # - file to be appended
@@ -61,10 +65,10 @@ $(eval $(IMAGE)_DEPS_REPORT =$$($(IMAGE)_DEPS_HCODE))
 $(eval $(IMAGE)_DEPS_REPORT+=$$($(IMAGE)_PATH)/.$(IMAGE).append.hcode)
 
 # image build using all files and serialised by dependencies
-$(eval $(call XIP_TOOL,append,.ppmr_header,$$($(IMAGE)_DEPS_PPMR_HDR),$$($(IMAGE)_FILE_PPMR_HDR)))
+$(eval $(call XIP_TOOL,append,.ppmr_header,$$($(IMAGE)_DEPS_PPMR_HDR),$$($(IMAGE)_FILE_PPMR_HDR) 1))
 $(eval $(call XIP_TOOL,append,.lvl1_bl,$$($(IMAGE)_DEPS_LVL1_BL),$$($(IMAGE)_FILE_LVL1_BL)))
 $(eval $(call XIP_TOOL,append,.lvl2_bl,$$($(IMAGE)_DEPS_LVL2_BL),$$($(IMAGE)_FILE_LVL2_BL)))
-$(eval $(call XIP_TOOL,append,.hcode,$$($(IMAGE)_DEPS_HCODE),$$($(IMAGE)_FILE_HCODE)))
+$(eval $(call XIP_TOOL,append,.hcode,$$($(IMAGE)_DEPS_HCODE),$$($(IMAGE)_FILE_HCODE) 1))
 
 # create image report for image with all files appended
 $(eval $(call XIP_TOOL,report,,$$($(IMAGE)_DEPS_REPORT)))
diff --git a/import/tools/imageProcs/restore_image.mk b/import/tools/imageProcs/restore_image.mk
index 6233b7c0..f7c363a5 100644
--- a/import/tools/imageProcs/restore_image.mk
+++ b/import/tools/imageProcs/restore_image.mk
@@ -32,8 +32,11 @@ $(eval $(IMAGE)_LINK_SCRIPT=restore_image.cmd)
 $(eval $(IMAGE)_LAYOUT=$(IMAGEPATH)/restore_image/restore_image.o)
 $(eval restore_image_COMMONFLAGS += -I$(ROOTPATH)/chips/p9/xip/)
 
+# files with multiple DD level content to be generated
+$(eval $(call BUILD_DD_LEVEL_CONTAINER,$1,cpmr_header))
+
 # files to be appended to image
-$(eval $(IMAGE)_FILE_CPMR=$(IMAGEPATH)/cpmr_header/cpmr_header.bin)
+$(eval $(IMAGE)_FILE_CPMR=$$($(IMAGE)_DD_CONT_cpmr_header))
 $(eval $(IMAGE)_FILE_SELF=$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)
 
 # dependencies for appending image sections in sequence:
@@ -51,7 +54,7 @@ $(eval $(IMAGE)_DEPS_REPORT =$$($(IMAGE)_DEPS_HCODE))
 $(eval $(IMAGE)_DEPS_REPORT+=$$($(IMAGE)_PATH)/.$(IMAGE).append.self_restore)
 
 # image build using all files and serialised by dependencies
-$(eval $(call XIP_TOOL,append,.cpmr,$$($(IMAGE)_DEPS_CPMR),$$($(IMAGE)_FILE_CPMR)))
+$(eval $(call XIP_TOOL,append,.cpmr,$$($(IMAGE)_DEPS_CPMR),$$($(IMAGE)_FILE_CPMR) 1))
 $(eval $(call XIP_TOOL,append,.self_restore,$$($(IMAGE)_DEPS_SELF),$$($(IMAGE)_FILE_SELF)))
 
 # create image report for image with all files appended
diff --git a/import/tools/imageProcs/sgpe_image.mk b/import/tools/imageProcs/sgpe_image.mk
index 678df611..3b0e2a5c 100644
--- a/import/tools/imageProcs/sgpe_image.mk
+++ b/import/tools/imageProcs/sgpe_image.mk
@@ -32,11 +32,15 @@ $(eval $(IMAGE)_LINK_SCRIPT=sgpe_image.cmd)
 $(eval $(IMAGE)_LAYOUT=$(IMAGEPATH)/sgpe_image/sgpe_image.o)
 $(eval sgpe_image_COMMONFLAGS += -I$(ROOTPATH)/chips/p9/xip/)
 
+# files with multiple DD level content to be generated
+$(eval $(call BUILD_DD_LEVEL_CONTAINER,$1,qpmr_header))
+$(eval $(call BUILD_DD_LEVEL_CONTAINER,$1,stop_gpe))
+
 # files to be appended to image
-$(eval $(IMAGE)_FILE_QPMR=$(IMAGEPATH)/qpmr_header/qpmr_header.bin)
+$(eval $(IMAGE)_FILE_QPMR=$$($(IMAGE)_DD_CONT_qpmr_header))
 $(eval $(IMAGE)_FILE_LVL1_BL=$(IMAGEPATH)/sgpe_lvl1_copier/sgpe_lvl1_copier.bin)
 $(eval $(IMAGE)_FILE_LVL2_BL=$(IMAGEPATH)/sgpe_lvl2_loader/sgpe_lvl2_loader.bin)
-$(eval $(IMAGE)_FILE_HCODE=$(IMAGEPATH)/stop_gpe/stop_gpe.bin)
+$(eval $(IMAGE)_FILE_HCODE=$$($(IMAGE)_DD_CONT_stop_gpe))
 
 # dependencies for appending image sections in sequence:
 # - file to be appended
@@ -61,10 +65,10 @@ $(eval $(IMAGE)_DEPS_REPORT =$$($(IMAGE)_DEPS_HCODE))
 $(eval $(IMAGE)_DEPS_REPORT+=$$($(IMAGE)_PATH)/.$(IMAGE).append.hcode)
 
 # image build using all files and serialised by dependencies
-$(eval $(call XIP_TOOL,append,.qpmr,$$($(IMAGE)_DEPS_QPMR),$$($(IMAGE)_FILE_QPMR)))
+$(eval $(call XIP_TOOL,append,.qpmr,$$($(IMAGE)_DEPS_QPMR),$$($(IMAGE)_FILE_QPMR) 1))
 $(eval $(call XIP_TOOL,append,.lvl1_bl,$$($(IMAGE)_DEPS_LVL1_BL),$$($(IMAGE)_FILE_LVL1_BL)))
 $(eval $(call XIP_TOOL,append,.lvl2_bl,$$($(IMAGE)_DEPS_LVL2_BL),$$($(IMAGE)_FILE_LVL2_BL)))
-$(eval $(call XIP_TOOL,append,.hcode,$$($(IMAGE)_DEPS_HCODE), $$($(IMAGE)_FILE_HCODE)))
+$(eval $(call XIP_TOOL,append,.hcode,$$($(IMAGE)_DEPS_HCODE), $$($(IMAGE)_FILE_HCODE) 1))
 
 # create image report for image with all files appended
 $(eval $(call XIP_TOOL,report,,$$($(IMAGE)_DEPS_REPORT)))