Autogenerate targeting xmls for ekb attributes

CMVC-Prereq: 1028808
Change-Id: I3d50cf242fd4cf23358c553a1b5395950616637e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41860
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 26 insertions, 6 deletions

diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index 6ab21b039..a4375eaa6 100755
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -69,9 +69,10 @@ COPY_FILES = \
     obj/genfiles/attrInfo.csv:vpo \
     obj/genfiles/attrEnumInfo.csv:vpo \
     obj/genfiles/targAttrInfo.csv:vpo \
-    obj/genfiles/target_types_merged.xml:openpower \
     obj/genfiles/fapiattrs.xml:openpower \
     obj/genfiles/config.h:openpower \
+    obj/genfiles/attribute_types_full.xml:openpower \
+    obj/genfiles/target_types_full.xml:openpower \
     src/usr/targeting/attroverride/README.attr_override:tools,openpower \
     src/build/hwpf/prcd_compile.tcl:tools \
     src/build/buildpnor/buildSbePart.pl:openpower \
@@ -115,7 +116,15 @@ COPY_FILES += $(if $(CONFIG_INCLUDE_XML_OPPOWERVM),src/usr/targeting/common/xmlt
 # Format is <dest file>:<source file>:<comma separated targets>
 #
 COPY_RENAME_FILES = \
-    makefile:src/build/mkrules/hbfw/makefile:fsp\
+    attribute_types.xml:obj/genfiles/attribute_types_full.xml:openpower \
+    target_types_merged.xml:obj/genfiles/target_types_full.xml:openpower \
+    attribute_types_hb.xml:src/usr/targeting/common/xmltohb/target_types_empty.xml:openpower \
+    target_types_hb.xml:src/usr/targeting/common/xmltohb/target_types_empty.xml:openpower \
+    attribute_types_oppowervm.xml:src/usr/targeting/common/xmltohb/target_types_empty.xml:openpower \
+    target_types_oppowervm.xml:src/usr/targeting/common/xmltohb/target_types_empty.xml:openpower \
+    attribute_types_openpower.xml:src/usr/targeting/common/xmltohb/target_types_empty.xml:openpower \
+    target_types_openpower.xml:src/usr/targeting/common/xmltohb/target_types_empty.xml:openpower \
+    makefile:src/build/mkrules/hbfw/makefile:fsp \
     img/makefile:src/build/mkrules/hbfw/img/makefile:fsp \
     hbicore.bin:img/hbicore$(UNDERSCORE_TEST).bin:vpo \
     img/hostboot_bootloader.bin:img/hbibl.bin:fsp,openpower,vpo \
@@ -257,6 +266,8 @@ fsp.tar_CONTENTS = \
     $(if $(CONFIG_SECUREBOOT),img/simics_CUMULUS_targeting.bin.protected) \
     $(if $(CONFIG_SECUREBOOT),img/simics_CUMULUS_targeting.bin.unprotected) \
     obj/genfiles/fapiattrs.xml \
+    obj/genfiles/attribute_types_sp.xml \
+    obj/genfiles/target_types_sp.xml \
     obj/genfiles/hb_plat_attr_srvc.H \
     src/import/hwpf/fapi2/xml/attribute_info/hb_temp_defaults.xml \
     $(addsuffix :targeting/,\
diff --git a/src/build/mkrules/hbfw/makefile b/src/build/mkrules/hbfw/makefile
index 44b087a5b..2f3f5ddd2 100755
--- a/src/build/mkrules/hbfw/makefile
+++ b/src/build/mkrules/hbfw/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2015
+# Contributors Listed Below - COPYRIGHT 2012,2017
 # [+] International Business Machines Corp.
 #
 #
@@ -63,10 +63,10 @@ TARFILES = fsp.tar simics.tar
 
 VPATH += fsp/hwas/common:
 
-_SUBDIR/BUILD/SETUP/fsp: expand_tars_fsp.tar
+_SUBDIR/BUILD/SETUP/fsp: expand_tars_fsp.tar overwrite_xml
 _SUBDIR/BUILD/SETUP/simics: expand_tars_simics.tar
 
-SETUP_TARGETS += expand_tars
+SETUP_TARGETS += expand_tars overwrite_xml
 EXPLIB_TARGETS += epub_check
 
 expand_tars: ${TARFILES:S/^/expand_tars_/g}
@@ -76,8 +76,17 @@ expand_tars_%: $${@:S/expand_tars_//}
 	@echo "===== src/hbfw/makefile: START EXTRACT of tarball $> :" `date`
 	${TAR} -x --file $> -C ${*:S/expand_tars_//}
 	@echo "===== src/hbfw/makefile: END EXTRACT of tarball $> :" `date`
+
+
+#Overwrites the old xml files with the new generated ones
+overwrite_xml: expand_tars_fsp.tar
+	@echo "Replacing attribute_types.xml with attribute_types_sp.xml"
+	cp fsp/attribute_types_sp.xml fsp/targeting/common/xmltohb/attribute_types.xml
+	@echo "Replacing target_types.xml with target_types_sp.xml"
+	cp fsp/target_types_sp.xml fsp/targeting/common/xmltohb/target_types.xml
+
 # Note that epub_check depends on expand_tars but it will always
-# be run first due to force of it in EXPINC.  
+# be run first due to force of it in EXPINC.
 epub_check: epubProcedureID_check.pl epub_service_codes.H
 	@echo "===== Checking epubProcedureID's Start:" `date`
 	${epubProcedureID_check.pl:P} ${epub_service_codes.H:P} ${hwasCallout.H:P}