diff options
| author | Prachi Gupta <pragupta@us.ibm.com> | 2017-03-28 15:42:50 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-03-29 11:26:06 -0400 |
| commit | 009456d1d6f548cf9596a223e935ff048d0cffad (patch) | |
| tree | 2bf2614877d579030cb6af947ac44e0ed6736e12 /src | |
| parent | d3a8c44a65f662b11268c338dc8bf08a7d7a369b (diff) | |
| download | talos-hostboot-009456d1d6f548cf9596a223e935ff048d0cffad.tar.gz talos-hostboot-009456d1d6f548cf9596a223e935ff048d0cffad.zip | |
add changes from common_mrw_xml to hb
- Add <global/> to FRU_ID
- Add missing TYPE
Change-Id: Ib09033713ab3a9f10dddd8691f569674478fd21a
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38550
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>
Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/targeting/common/entitypath.C | 19 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 37 | ||||
| -rwxr-xr-x | src/usr/targeting/common/xmltohb/xmltohb.pl | 1 |
3 files changed, 54 insertions, 3 deletions
diff --git a/src/usr/targeting/common/entitypath.C b/src/usr/targeting/common/entitypath.C index 23d4d5475..eca52eb9f 100644 --- a/src/usr/targeting/common/entitypath.C +++ b/src/usr/targeting/common/entitypath.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* Contributors Listed Below - COPYRIGHT 2012,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -447,6 +447,23 @@ const char* EntityPath::pathElementTypeAsString( return "ETH"; case TYPE_PANEL: return "PANEL"; + case TYPE_BMC: + return "BMC"; + case TYPE_FLASH: + return "FLASH"; + case TYPE_SEEPROM: + return "SEEPROM"; + case TYPE_TMP: + return "TMP"; + case TYPE_GPIO_EXPANDER: + return "GPIO_EXPANDER"; + case TYPE_POWER_SEQUENCER: + return "POWER_SEQUENCER"; + case TYPE_RTC: + return "RTC"; + case TYPE_FANCTLR: + return "FANCTLR"; + // case TYPE_FSI_LINK: // return "FSI-link"; // case TYPE_CFAM: diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index c406e2b4d..5b75b4430 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -313,14 +313,46 @@ <name>PANEL</name> <value>57</value> </enumerator> + <enumerator> + <name>BMC</name> + <value>58</value> + </enumerator> + <enumerator> + <name>FLASH</name> + <value>59</value> + </enumerator> + <enumerator> + <name>SEEPROM</name> + <value>60</value> + </enumerator> + <enumerator> + <name>TMP</name> + <value>61</value> + </enumerator> + <enumerator> + <name>GPIO_EXPANDER</name> + <value>62</value> + </enumerator> + <enumerator> + <name>POWER_SEQUENCER</name> + <value>63</value> + </enumerator> + <enumerator> + <name>RTC</name> + <value>64</value> + </enumerator> + <enumerator> + <name>FANCTLR</name> + <value>65</value> + </enumerator> <!-- add any new types here, and increment TEST_FAIL and LAST_IN_RANGE --> <enumerator> <name>TEST_FAIL</name> - <value>58</value> + <value>66</value> </enumerator> <enumerator> <name>LAST_IN_RANGE</name> - <value>59</value> + <value>67</value> </enumerator> <default>NA</default> </enumerationType> @@ -13740,6 +13772,7 @@ Measured in GB</description> <simpleType><uint32_t><default>0</default></uint32_t></simpleType> <persistency>non-volatile</persistency> <readable/> + <global/> </attribute> <attribute> diff --git a/src/usr/targeting/common/xmltohb/xmltohb.pl b/src/usr/targeting/common/xmltohb/xmltohb.pl index b157718df..e1cf4447f 100755 --- a/src/usr/targeting/common/xmltohb/xmltohb.pl +++ b/src/usr/targeting/common/xmltohb/xmltohb.pl @@ -527,6 +527,7 @@ sub validateAttributes { $elements{"tempAttribute"} = { required => 0, isscalar => 0}; $elements{"serverwizReadonly"} = { required => 0, isscalar => 0}; $elements{"serverwizShow"} = { required => 0, isscalar => 1}; + $elements{"global"} = { required => 0, isscalar => 0}; foreach my $attribute (@{$attributes->{attribute}}) { |
