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

4 files changed, 5 insertions, 36 deletions

diff --git a/rings/p9n.hw.overlays.bin b/rings/p9n.hw.overlays.bin
deleted file mode 100644
index fd76c656..00000000
--- a/rings/p9n.hw.overlays.bin
+++ /dev/null
diff --git a/rings/p9n.hw.rings.bin b/rings/p9n.hw.rings.bin
deleted file mode 100644
index 7755005f..00000000
--- a/rings/p9n.hw.rings.bin
+++ /dev/null
diff --git a/rings/rings.mk b/rings/rings.mk
deleted file mode 100755
index cab07873..00000000
--- a/rings/rings.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: rings/rings.mk $
-#
-# OpenPOWER HCODE Project
-#
-# COPYRIGHT 2017
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-../../import/../output/gen/rings/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/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/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)))