diff options
Diffstat (limited to 'src/usr/targeting/xmltohb')
| -rw-r--r-- | src/usr/targeting/xmltohb/fapi_utils.pl | 7 | ||||
| -rwxr-xr-x | src/usr/targeting/xmltohb/makefile | 25 |
2 files changed, 17 insertions, 15 deletions
diff --git a/src/usr/targeting/xmltohb/fapi_utils.pl b/src/usr/targeting/xmltohb/fapi_utils.pl index 9253fa9eb..f1e7bd124 100644 --- a/src/usr/targeting/xmltohb/fapi_utils.pl +++ b/src/usr/targeting/xmltohb/fapi_utils.pl @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2017 +# Contributors Listed Below - COPYRIGHT 2017,2019 # [+] International Business Machines Corp. # # @@ -282,7 +282,8 @@ sub createTargetExtensionFromFapi(\%,\%) TARGET_TYPE_OMIC => "unit-omic-power9", TARGET_TYPE_MCC => "unit-mcc-power9", TARGET_TYPE_OCMB_CHIP => "chip-ocmb", - TARGET_TYPE_MEM_PORT => "unit-mem_port" + TARGET_TYPE_MEM_PORT => "unit-mem_port", + TARGET_TYPE_PMIC => "pmic", }; # Loop through all of the targets that this attribute @@ -293,7 +294,7 @@ sub createTargetExtensionFromFapi(\%,\%) my $foundmatch = 0; $type =~ s/\s//g; my $targtype = $fapi2targ->{$type}; - #print "type = $type -> $targtype\n"; + # print "type = $type -> $targtype\n"; my $attrid = $fapiattr->{id}; $attrid =~ s/ATTR_//; diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile index 8f36b995e..213d9a3a5 100755 --- a/src/usr/targeting/xmltohb/makefile +++ b/src/usr/targeting/xmltohb/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2011,2018 +# Contributors Listed Below - COPYRIGHT 2011,2019 # [+] International Business Machines Corp. # # @@ -59,11 +59,13 @@ FAPIATTRSRVC_SOURCE = \ # Attribute XML files. -FAPI2_ATTR_XML += $(wildcard $(ROOTPATH)/src/import/chips/p9/procedures/xml/attribute_info/*) -FAPI2_ATTR_XML += $(wildcard $(ROOTPATH)/src/import/hwpf/fapi2/xml/attribute_info/*) -FAPI2_ATTR_XML += $(wildcard $(ROOTPATH)/src/import/chips/centaur/procedures/xml/attribute_info/*) -FAPI2_ATTR_XML += $(wildcard $(ROOTPATH)/src/import/generic/procedures/xml/attribute_info/*) -FAPI2_ATTR_XML += $(wildcard $(ROOTPATH)/src/import/chips/ocmb/explorer/procedures/xml/attribute_info/*) +FAPI2_ATTR_XML += $(wildcard $(ROOTPATH)/src/import/chips/p9/procedures/xml/attribute_info/*.xml) +FAPI2_ATTR_XML += $(wildcard $(ROOTPATH)/src/import/hwpf/fapi2/xml/attribute_info/*.xml) +FAPI2_ATTR_XML += $(wildcard $(ROOTPATH)/src/import/chips/centaur/procedures/xml/attribute_info/*.xml) +FAPI2_ATTR_XML += $(wildcard $(ROOTPATH)/src/import/generic/procedures/xml/attribute_info/*.xml) +FAPI2_ATTR_XML += $(wildcard $(ROOTPATH)/src/import/chips/ocmb/explorer/procedures/xml/attribute_info/*.xml) +FAPI2_ATTR_XML += $(wildcard $(ROOTPATH)/src/import/chips/ocmb/common/procedures/xml/attribute_info/*.xml) + # Filter out Temp defaults XML file from Attribute XML files. # NOTE: The hb_temp_defaults.xml file is not a normal attribute file with the @@ -230,7 +232,8 @@ CLEAN_TARGETS += $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES:.bin=.xml}) CLEAN_TARGETS += ${GENDIR}/${HB_PLAT_ATTR_SRVC_H} CLEAN_TARGETS += ${GENDIR}/${XMLTOHB_GENERIC_XML} CLEAN_TARGETS += ${GENDIR}/${XMLTOHB_FAPI_XML} -CLEAN_TARGETS += ${GENDIR}/errl/errludattribute.H +CLEAN_TARGETS += ${GENDIR}/errl/errludattributeP_gen.H +CLEAN_TARGETS += ${GENDIR}/errludattribute_gen.C CLEAN_TARGETS += ${GENDIR}/errl/errludtarget.H CLEAN_TARGETS += ${GENDIR}/targAttrInfo.csv CLEAN_TARGETS += ${GENDIR}/targAttrOverrideData.H @@ -381,8 +384,7 @@ ${GENDIR}/${XMLTOHB_FULL_ATTRIBUTE_TYPES}: \ $(addprefix --ekbXmlFile=,${GENDIR}/${XMLTOHB_EKB_ATTRIBUTE_TYPES}) \ $(addprefix --hbXmlFile=,${GENDIR}/${XMLTOHB_SRC_ATTRIBUTE_TYPES}) \ $(addprefix --fapi2Header=,${ROOTPATH}/src/include/usr/fapi2/attribute_service.H) \ - $(addprefix --outFile=,${GENDIR}/${XMLTOHB_FULL_ATTRIBUTE_TYPES}) \ - --verbose + $(addprefix --outFile=,${GENDIR}/${XMLTOHB_FULL_ATTRIBUTE_TYPES}) # Add EKB attribute xml to config xml to produce the final output. # Skip adding any attributes that already exists in the src xml @@ -393,8 +395,7 @@ ${GENDIR}/${XMLTOHB_SP_ATTRIBUTE_TYPES}: \ $(addprefix --ekbXmlFile=,${GENDIR}/${XMLTOHB_EKB_ATTRIBUTE_TYPES}) \ $(addprefix --hbXmlFile=,${GENDIR}/${XMLTOHB_CONFIG_ATTRIBUTE_TYPES}) \ $(addprefix --fapi2Header=,${ROOTPATH}/src/include/usr/fapi2/attribute_service.H) \ - $(addprefix --outFile=,${GENDIR}/${XMLTOHB_SP_ATTRIBUTE_TYPES}) \ - --verbose + $(addprefix --outFile=,${GENDIR}/${XMLTOHB_SP_ATTRIBUTE_TYPES}) # generic XML is created from the generic sources only ${GENDIR}/${XMLTOHB_GENERIC_XML}: \ @@ -409,7 +410,7 @@ $(XMLTOHB_RAN_INDICATION): ${XMLTOHB_COMPILER_SCRIPT} \ $(addprefix --fapi-attributes-xml-file=,${GENDIR}/${XMLTOHB_FAPI_XML}) \ --src-output-dir=$(GENDIR) --img-output-dir=none \ --img-output-file=none - cp ${GENDIR_ERRL}/errludattribute.H ${GENDIR_PLUGINS} + cp ${GENDIR_ERRL}/errludattributeP_gen.H ${GENDIR_PLUGINS} cp ${GENDIR_ERRL}/errludtarget.H ${GENDIR_PLUGINS} touch $(XMLTOHB_RAN_INDICATION) |
