Integration: proc_select_boot_master

Change-Id: I3bd4e6f1afb2c36dc5a31cd5512b4ac0deef9df5
RTC:	42181
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2980
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 80 insertions, 3 deletions

diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index a4e7274a8..61fa495bc 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -6479,7 +6479,7 @@ firmware notes: Used as override attribute for pstate procedure
         <uint8_t>
             <default>0</default>
         </uint8_t>
-        <array>2</array> 
+        <array>2</array>
     </simpleType>
     <persistency>volatile-zeroed</persistency>
     <readable/>
@@ -9952,4 +9952,79 @@ Measured in GB</description>
     </hwpfToHbAttrMap>
 </attribute>
 <!-- End support for sync_attributes.xml -->
+
+<!--    Support for proc_select_boot_master -->
+
+<enumerationType>
+    <id>PROC_SELECT_BOOT_MASTER</id>
+    <description>Enumeration indicating which chip should be used as the PROC_SELECT_BOOT_MASTER</description>
+    <enumerator>
+        <name>PRIMARY</name>
+        <value>1</value>
+    </enumerator>
+    <enumerator>
+        <name>SECONDARY</name>
+        <value>2</value>
+    </enumerator>
+</enumerationType>
+
+<attribute>
+  <id>PROC_SELECT_BOOT_MASTER</id>
+  <description>
+    Specifies which chip should be used as the boot master
+    Initialized by the platform.
+      PRIMARY  - the primary master is used for the BOOT
+      SECONDARY  - the alternate master is used for the BOOT
+      Platforms are expected to set this to PRIMARY in normal operation
+  </description>
+  <simpleType>
+    <uint8_t>
+      <default>1</default>
+    </uint8_t>
+  </simpleType>
+  <persistency>volatile</persistency>
+  <readable/>
+  <writeable/>
+  <hwpfToHbAttrMap>
+      <id>ATTR_PROC_SELECT_BOOT_MASTER</id>
+      <macro>DIRECT</macro>
+  </hwpfToHbAttrMap>
+</attribute>
+
+
+<enumerationType>
+    <id>PROC_SELECT_SEEPROM_IMAGE</id>
+    <description>Enumeration indicating which SEEPROM image should be used for the boot master</description>
+    <enumerator>
+        <name>FIRST</name>
+        <value>1</value>
+    </enumerator>
+    <enumerator>
+        <name>SECOND</name>
+        <value>2</value>
+    </enumerator>
+</enumerationType>
+
+<attribute>
+  <id>PROC_SELECT_SEEPROM_IMAGE</id>
+  <description>
+    Specifies which SEEPROM image should be used for the boot master.
+      FIRST  - the first image was selected
+      SECOND - the second image was selected
+      Platforms are expected to set this to FIRST in normal operation
+  </description>
+  <simpleType>
+      <uint8_t>
+        <default>1</default>
+      </uint8_t>
+  </simpleType>
+  <persistency>volatile</persistency>
+  <readable/>
+  <writeable/>
+  <hwpfToHbAttrMap>
+      <id>ATTR_PROC_SELECT_SEEPROM_IMAGE</id>
+      <macro>DIRECT</macro>
+  </hwpfToHbAttrMap>
+</attribute>
+
 </attributes>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 84969da3d..6b94a88ef 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -138,6 +138,9 @@
     <attribute><id>SBE_IMAGE_OFFSET</id></attribute>
     <attribute><id>BOOT_VOLTAGE</id></attribute>
     <attribute><id>SYNC_BETWEEN_STEPS</id></attribute>
+    <!--    proc_select_boot_master attributes  -->
+    <attribute><id>PROC_SELECT_BOOT_MASTER</id></attribute>
+    <attribute><id>PROC_SELECT_SEEPROM_IMAGE</id></attribute>
 </targetType>
 
 <targetType>
@@ -336,7 +339,7 @@
      <attribute><id>PROC_A_ENABLE</id></attribute>
      <attribute><id>PROC_X_ENABLE</id></attribute>
      <!-- ===== End supporting A/X bus enable in p8_xip_customize_attributes.xml ===== -->

-     
+
 </targetType>
 
 <targetType>
@@ -411,7 +414,6 @@
     <attribute><id>PROC_PB_BNDY_DMIPLL_SCAN_SELECT</id></attribute>
     <attribute><id>PROC_AB_BNDY_PLL_SCAN_SELECT</id></attribute>
     <attribute><id>PROC_PCI_BNDY_PLL_SCAN_SELECT</id></attribute>
-
 </targetType>
 
 <targetType>