Pull FSI data from real attributes (Task 3909).

There are a group of attributes defined for FSI now.
-ATTR_FSI_MASTER_CHIP
-ATTR_FSI_MASTER_TYPE
-ATTR_FSI_MASTER_PORT
-ATTR_FSI_SLAVE_CASCADE
-ATTR_FSI_OPTION_FLAGS

Also includes work for Story 3996.  The attributes are now broken
into 3 distinct pieces:
- attribute_types.xml : defines hostboot attributes
- target_types.xml : defines different types of targets
- XXX.system.xml : system-specific information, equivalent to what
                   we'll get from system workbook

These are then used to generic system-specific binaries, currently
for 3 platforms:
- simics_SALERNO_targeting.bin
- simics_VENICE_targeting.bin
- vbu_targeting.bin

Change-Id: I2bf920cc62cceb761ab44a07df433da44249d0e0
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/426
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 37 insertions, 11 deletions

diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile
index e9431c374..d4e28dab7 100644
--- a/src/usr/targeting/xmltohb/makefile
+++ b/src/usr/targeting/xmltohb/makefile
@@ -34,23 +34,27 @@ XMLTOHB_HEADER_TARGETS =    \
 XMLTOHB_SOURCE_TARGETS =    \
     attributestrings.C  
 
-XMLTOHB_BINARY_TARGETS =    \
-    targeting.bin
+XMLTOHB_SYSTEM_BINARIES = \
+   vbu_targeting.bin \
+   simics_SALERNO_targeting.bin \
+   simics_VENICE_targeting.bin 
 
 XMLTOHB_TARGETS = \
     ${XMLTOHB_HEADER_TARGETS} \
-    ${XMLTOHB_SOURCE_TARGETS} \
-    ${XMLTOHB_BINARY_TARGETS}
+    ${XMLTOHB_SOURCE_TARGETS} 
 
-XMLTOHB_HBXML_SOURCES = \
-    hb.xml
+XMLTOHB_GENERIC_SOURCES = attribute_types.xml target_types.xml
 
 XMLTOHB_FAPIATTR_SOURCES = \
     ${ROOTPATH}/src/usr/hwpf/hwp/fapiHwpAttributeInfo.xml
 
-GENFILES = ${XMLTOHB_TARGETS}
+GENFILES = ${XMLTOHB_TARGETS} 
 
-EXTRA_PARTS = $(addprefix $(IMGDIR)/, $(XMLTOHB_BINARY_TARGETS))
+EXTRA_PARTS = $(addprefix $(IMGDIR)/, $(XMLTOHB_SYSTEM_BINARIES))
+
+EXTRA_CLEAN = $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES}) \
+	      $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES:.bin=.xml}) \
+              ${GENDIR}/generic.xml
 
 include ${ROOTPATH}/config.mk
 
@@ -60,10 +64,32 @@ include ${ROOTPATH}/config.mk
 ${EXTRA_PARTS}: ${IMGDIR}/% : ${GENDIR}/%
 	cp -f $^ $@
 
+# generic XML is created from the generic sources only
+${GENDIR}/generic.xml: ${XMLTOHB_GENERIC_SOURCES}
+	./mergexml.sh $^ > $@
+
+# create the header files, only needs generic xml
 $(call GENTARGET,$(XMLTOHB_TARGETS)) : \
-		xmltohb.pl ${XMLTOHB_HBXML_SOURCES} ${XMLTOHB_FAPIATTR_SOURCES}
-	./$< $(addprefix --hb-xml-file=,${XMLTOHB_HBXML_SOURCES}) \
+		xmltohb.pl ${GENDIR}/generic.xml ${XMLTOHB_FAPIATTR_SOURCES}
+	./$< $(addprefix --hb-xml-file=,${GENDIR}/generic.xml) \
+	     $(addprefix --fapi-attributes-xml-file=,\
+			 ${XMLTOHB_FAPIATTR_SOURCES}) \
+	     --src-output-dir=$(dir $@) --img-output-dir=none \
+	     --img-output-file=none
+
+# system-specific XML needs the generic plus the xxx.system.xml file
+${GENDIR}/%.hb.xml: %.system.xml ${XMLTOHB_GENERIC_SOURCES}
+	./mergexml.sh $^ > $@
+
+
+# create the binary files
+${GENDIR}/%_targeting.bin: xmltohb.pl ${GENDIR}/%.hb.xml ${XMLTOHB_FAPIATTR_SOURCES}
+	./$< $(addprefix --hb-xml-file=,${GENDIR}/$*.hb.xml) \
 	     $(addprefix --fapi-attributes-xml-file=,\
 			 ${XMLTOHB_FAPIATTR_SOURCES}) \
-	     --src-output-dir=$(dir $@) --img-output-dir=$(dir $@)
+	     --src-output-dir=none --img-output-dir=$(dir $@) \
+	     --img-output-file=$(notdir $@)
+
+
+