summaryrefslogtreecommitdiffstats
path: root/src/usr/targeting/common/xmltohb
diff options
context:
space:
mode:
authorElizabeth K. Liner <eliner@us.ibm.com>2017-06-21 11:12:07 -0400
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-06-22 15:41:10 -0400
commit30db3842625fe111a3d609773da25b97147af5ba (patch)
treea90ba56b68774d7b508ad4aac6455e99aa9bcde3 /src/usr/targeting/common/xmltohb
parent8f1c6259e6d88a9490755e7e8385f953f6559a0b (diff)
downloadtalos-hostboot-30db3842625fe111a3d609773da25b97147af5ba.tar.gz
talos-hostboot-30db3842625fe111a3d609773da25b97147af5ba.zip
Revert "ProcessMRW changes for dynamic i2c devices"
This reverts commit 651ed35f1c045ea0c52ac659f9c27d757a351877. Change-Id: I6152ddd93890383f6c22ff07241ce5d078ab40fc Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42221 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: Nicholas E. Bofferding <bofferdn@us.ibm.com> Reviewed-by: Prachi Gupta <pragupta@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/targeting/common/xmltohb')
-rw-r--r--src/usr/targeting/common/xmltohb/attribute_types_openpower.xml4
-rw-r--r--src/usr/targeting/common/xmltohb/target_types_openpower.xml6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml b/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml
index 2635b8ea4..b0a571f96 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml
@@ -191,7 +191,7 @@
</attribute>
<attribute>
- <id>HDAT_I2C_DEVICE_TYPE</id>
+ <id>HDAT_I2C_DEVTYPE</id>
<description>
This attribute holds the values of the I2C device type from the i2c
device connections as defined in the MRW. It is parsed into a
@@ -255,7 +255,7 @@
</attribute>
<attribute>
- <id>HDAT_I2C_DEVICE_PURPOSE</id>
+ <id>HDAT_I2C_DEV_PURPOSE</id>
<description>
This attribute holds the values of the I2C device purpose from the i2c
device connections as defined in the MRW. It is parsed into a
diff --git a/src/usr/targeting/common/xmltohb/target_types_openpower.xml b/src/usr/targeting/common/xmltohb/target_types_openpower.xml
index 83abac457..e039b77dc 100644
--- a/src/usr/targeting/common/xmltohb/target_types_openpower.xml
+++ b/src/usr/targeting/common/xmltohb/target_types_openpower.xml
@@ -32,14 +32,14 @@
=====================================================================
-->
<targetTypeExtension>
- <id>chip-processor</id>
+ <id>base</id>
<attribute><id>HDAT_I2C_ENGINE</id></attribute>
<attribute><id>HDAT_I2C_MASTER_PORT</id></attribute>
- <attribute><id>HDAT_I2C_DEVICE_TYPE</id></attribute>
+ <attribute><id>HDAT_I2C_DEVTYPE</id></attribute>
<attribute><id>HDAT_I2C_ADDR</id></attribute>
<attribute><id>HDAT_I2C_SLAVE_PORT</id></attribute>
<attribute><id>HDAT_I2C_BUS_FREQ</id></attribute>
- <attribute><id>HDAT_I2C_DEVICE_PURPOSE</id></attribute>
+ <attribute><id>HDAT_I2C_DEV_PURPOSE</id></attribute>
<attribute><id>HDAT_I2C_ELEMENTS</id></attribute>
<attribute>
<id>IPMI_INSTANCE</id>
OpenPOWER on IntegriCloud