diff options
| author | Prachi Gupta <pragupta@us.ibm.com> | 2017-08-15 10:50:59 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-08-22 11:20:30 -0400 |
| commit | 823bdb8ddb50da3e7f48a7b8a1066d1aa61e9f17 (patch) | |
| tree | 30961541ec5d1995b201d9d2bd8ccacfd672672a /src/usr/targeting/xmltohb | |
| parent | b3ad5819f9cbed67ceb0fa74d28d2f93227bbbcb (diff) | |
| download | blackbird-hostboot-823bdb8ddb50da3e7f48a7b8a1066d1aa61e9f17.tar.gz blackbird-hostboot-823bdb8ddb50da3e7f48a7b8a1066d1aa61e9f17.zip | |
cumulus: compile memory attribute xmls in hostboot
remove duplicate attributes
add missing HWPs to istep07's makefile
fix fapi_util.pl to support empty descriptions
Add attributes to simics_CUMULUS and update target type in fapi_utils.pl
Change-Id: Ic2ada212b35bb6cf96181a6dc16959f09eb04122
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44636
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Sakethan R. Kotta <sakkotta@in.ibm.com>
Reviewed-by: SWATHI M. BHATTIPROLU <bhmadhur@in.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/targeting/xmltohb')
| -rw-r--r-- | src/usr/targeting/xmltohb/fapi_utils.pl | 11 | ||||
| -rwxr-xr-x | src/usr/targeting/xmltohb/makefile | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/usr/targeting/xmltohb/fapi_utils.pl b/src/usr/targeting/xmltohb/fapi_utils.pl index de451b35e..39b9e87d5 100644 --- a/src/usr/targeting/xmltohb/fapi_utils.pl +++ b/src/usr/targeting/xmltohb/fapi_utils.pl @@ -137,7 +137,14 @@ sub createAttrFromFapi(\%) # description: passed as-is my $description = $fapiattr->{description}; - $targattr->{description} = $description; + if(ref $fapiattr->{description} && eval {keys %{$fapiattr->{description}} == 0} ) + { + $targattr->{description} = "place holder description"; + } + else + { + $targattr->{description} = $description; + } # valueType: convert my $valueType = convertValueFapi2Targ($fapiattr->{valueType}); @@ -236,7 +243,7 @@ sub createTargetExtensionFromFapi(\%,\%) TARGET_TYPE_SYSTEM => "sys-sys-power9", TARGET_TYPE_DIMM => "lcard-dimm", TARGET_TYPE_PROC_CHIP => "chip-processor", - TARGET_TYPE_MEMBUF_CHIP => "chip-membuf", + TARGET_TYPE_MEMBUF_CHIP => "chip-membuf-centaur", TARGET_TYPE_EX => "unit-ex-power9", TARGET_TYPE_MBA => "unit-mba", TARGET_TYPE_MCS => "unit-mcs-power9", diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile index 35fa36761..eaf50a587 100755 --- a/src/usr/targeting/xmltohb/makefile +++ b/src/usr/targeting/xmltohb/makefile @@ -61,14 +61,16 @@ 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/*) + # 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 # normal structures that define the attribute itself. It temporarily # provides default values for new attributes defined in other files. - FAPI2_ATTR_XML := $(filter-out $(ROOTPATH)/src/import/hwpf/fapi2/xml/attribute_info/hb_temp_defaults.xml,$(FAPI2_ATTR_XML)) FAPI2_ATTR_XML := $(filter-out $(wildcard $(ROOTPATH)/src/import/hwpf/fapi2/xml/attribute_info/*~) ,$(FAPI2_ATTR_XML)) FAPI2_ATTR_XML := $(filter-out $(wildcard $(ROOTPATH)/src/import/chips/p9/procedures/xml/attribute_info/*~),$(FAPI2_ATTR_XML)) +FAPI2_ATTR_XML := $(filter-out $(wildcard $(ROOTPATH)/src/import/chips/centaur/procedures/xml/attribute_info/*~),$(FAPI2_ATTR_XML)) XMLTOHB_FAPIATTR_SOURCES += ${FAPI2_ATTR_XML} |
