Merge branch 'master' of ssh://ralgit01.raleigh.ibm.com:29418/hw/op-hcode

3 files changed, 15 insertions, 19 deletions

diff --git a/rings/rings.mk b/rings/rings.mk
index 91801dba..cab07873 100755
--- a/rings/rings.mk
+++ b/rings/rings.mk
@@ -23,10 +23,10 @@
 #
 # IBM_PROLOG_END_TAG
 ../../import/../output/gen/rings/hw/p9n.hw.rings.bin :
-	@mkdir -p $(GENPATH)/rings/p9n/hw/
-	cp $(BASEPATH)/rings/p9n.hw.rings.bin  $(GENPATH)/rings/p9n/hw/p9n.hw.rings.bin
+	@mkdir -p $(GENPATH)/rings/hw/
+	cp $(BASEPATH)/rings/p9n.hw.rings.bin  $(GENPATH)/rings/hw/p9n.hw.rings.bin
 
-../../import/../output/gen/rings/p9n/hw/p9n.hw.overlays.bin :
-	@mkdir -p $(GENPATH)/rings/p9n/hw/
-	cp $(BASEPATH)/rings/p9n.hw.overlays.bin  $(GENPATH)/rings/p9n/hw/p9n.hw.overlays.bin
+../../import/../output/gen/rings/hw/p9n.hw.overlays.bin :
+	@mkdir -p $(GENPATH)/rings/hw/
+	cp $(BASEPATH)/rings/p9n.hw.overlays.bin  $(GENPATH)/rings/hw/p9n.hw.overlays.bin
 
diff --git a/tools/build/common.dir/order.final.mk b/tools/build/common.dir/order.final.mk
index e98c1460..605f4cb1 100644
--- a/tools/build/common.dir/order.final.mk
+++ b/tools/build/common.dir/order.final.mk
@@ -30,7 +30,6 @@
 #    * 'IMAGE' where images are built.
 #    * 'ALL' for everything else, like documentation.
 
-HW_IMAGE_VERSION = $(shell cat $(ROOTPATH)/../tools/build/release_tag.txt)
 
 .PHONY: _BUILD/GEN_TARGETS _BUILD/GEN_TARGETS/ACT
 _BUILD/GEN_TARGETS:
@@ -53,14 +52,6 @@ _BUILD/IMAGE_TARGETS: _BUILD/EXE_TARGETS | $(IMAGE_DEPS)
 _BUILD/IMAGE_TARGETS/ACT: $(IMAGE_TARGETS) suppress_nothing_to_do
 
 .PHONY: all _BUILD/ALL_TARGETS/ACT
-all: _BUILD/IMAGE_TARGETS install_rings
+all: _BUILD/IMAGE_TARGETS
 		@$(MAKE) _BUILD/ALL_TARGETS/ACT
-		$(EXEPATH)/p9_xip_tool.exe $(IMAGEPATH)/hw_image/p9n.hw_image.bin set build_tag $(HW_IMAGE_VERSION)
 _BUILD/ALL_TARGETS/ACT: $(ALL_TARGETS) suppress_nothing_to_do
-
-
-.PHONY: install_rings
-
-install_rings:
-	@mkdir -p $(GENPATH)/rings/hw/
-	@cp $(BASEPATH)/rings/* $(GENPATH)/rings/hw/
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