From c4362eadbba0b06d27c47c45e0dabf3e079d4368 Mon Sep 17 00:00:00 2001
From: Elliott Dahle <dedahle@us.ibm.com>
Date: Thu, 7 Nov 2013 10:06:44 -0600
Subject: Ensure code determines master proc properly

Change-Id: I4400a10f2ae65269f809a3b2824837674102c51e
RTC:78076
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7099
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
---
 src/usr/hwpf/hwp/chip_attributes.xml                 | 17 +++++++++++++++++
 src/usr/targeting/common/xmltohb/attribute_types.xml | 10 +++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/usr/hwpf/hwp/chip_attributes.xml b/src/usr/hwpf/hwp/chip_attributes.xml
index abd5ff061..00aeb28ed 100644
--- a/src/usr/hwpf/hwp/chip_attributes.xml
+++ b/src/usr/hwpf/hwp/chip_attributes.xml
@@ -177,4 +177,21 @@
     <writeable/>
   </attribute>
   <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_PROC_MASTER_TYPE</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+        Returns a value indicating the master type of this chip:
+        master, alt-master, or not master.
+    </description>
+    <valueType>uint8</valueType>
+    <enum>
+        ACTING_MASTER = 0x00,
+        MASTER_CANDIDATE = 0x01,
+        NOT_MASTER = 0x02
+    </enum>
+    <platInit/>
+    <writeable/>
+  </attribute>
+  <!-- ********************************************************************* -->
 </attributes>
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index a42601258..cab9dd76d 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -12622,14 +12622,18 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript
     <description>Type of Master, ACTING_MASTER or MASTER_CANDIDATE or
       NOT_MASTER</description>
     <simpleType>
-        <enumeration>
-            <id>PROC_MASTER_TYPE</id>
-        </enumeration>
+        <uint8_t>
+            <default>NOT_MASTER</default>
+        </uint8_t>
     </simpleType>
     <persistency>non-volatile</persistency>
     <hasStringConversion/>
     <readable/>
     <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PROC_MASTER_TYPE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
 </attribute>
 
 <attribute>
-- 
cgit v1.2.1