Cleanup enum MNFG_FLAG_BIT_MNFG_IPL_MEMORY_CE_CHECKINGE

Third and final step to remove the typo and long enunerations now that
fsp has picked up the common changes and fsp changes are built.

Change-Id: I8fa8c9cd51ca020ee6ebb4a35cf7e68c80d45519
CMVC-prereq: 916597
RTC: 89378
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9291
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 4 insertions, 102 deletions

diff --git a/src/usr/diag/mdia/mdiasm.C b/src/usr/diag/mdia/mdiasm.C
index cb30d2bfc..658390eb9 100644
--- a/src/usr/diag/mdia/mdiasm.C
+++ b/src/usr/diag/mdia/mdiasm.C
@@ -772,7 +772,7 @@ errlHndl_t StateMachine::doMaintCommand(WorkFlowProperties & i_wfp)
             break;
         }
 
-        if( TARGETING::MNFG_FLAG_BIT_MNFG_IPL_MEMORY_CE_CHECKINGE
+        if( TARGETING::MNFG_FLAG_IPL_MEMORY_CE_CHECKING
             & iv_globals.mfgPolicy )
         {
             // For MNFG mode, check CE also
@@ -1043,11 +1043,11 @@ bool StateMachine::processMaintCommandEvent(const MaintCommandEvent & i_event)
         if(( INITSERVICE::isShutdownRequested() ) &&
            (( COMMAND_COMPLETE == eventType ) ||
             ( COMMAND_STOPPED  == eventType )) &&
-           ! (( MNFG_FLAG_BIT_MNFG_ENABLE_EXHAUSTIVE_PATTERN_TEST
+           ! (( MNFG_FLAG_ENABLE_EXHAUSTIVE_PATTERN_TEST
                 & iv_globals.mfgPolicy) ||
-              ( MNFG_FLAG_BIT_MNFG_ENABLE_STANDARD_PATTERN_TEST
+              ( MNFG_FLAG_ENABLE_STANDARD_PATTERN_TEST
                 & iv_globals.mfgPolicy) ||
-              ( MNFG_FLAG_BIT_MNFG_ENABLE_MINIMUM_PATTERN_TEST
+              ( MNFG_FLAG_ENABLE_MINIMUM_PATTERN_TEST
                 & iv_globals.mfgPolicy)))
         {
             MDIA_FAST("sm: shutdown requested, overrding event "
diff --git a/src/usr/hwpf/hwp/system_attributes.xml b/src/usr/hwpf/hwp/system_attributes.xml
index 82dcba738..ba45cd794 100644
--- a/src/usr/hwpf/hwp/system_attributes.xml
+++ b/src/usr/hwpf/hwp/system_attributes.xml
@@ -52,9 +52,6 @@
     <platInit/>
   </attribute>
   <!-- ********************************************************************* -->
-  <!-- TODO: RTC 89378 remove MNFG_IPL_MEMORY_CE_CHECKINGE once
-             the attributes_types update is included in the fsp build
-             to keep the defintions in sync -->
   <attribute>
     <id>ATTR_MNFG_FLAGS</id>
     <targetType>TARGET_TYPE_SYSTEM</targetType>
@@ -69,7 +66,6 @@
         MNFG_AVP_ENABLE                     = 0x0000000000000002,
         MNFG_HDAT_AVP_ENABLE                = 0x0000000000000004,
         MNFG_SRC_TERM                       = 0x0000000000000008,
-        MNFG_IPL_MEMORY_CE_CHECKINGE        = 0x0000000000000010,
         MNFG_IPL_MEMORY_CE_CHECKING         = 0x0000000000000010,
         MNFG_FAST_BACKGROUND_SCRUB          = 0x0000000000000020,
         MNFG_TEST_DRAM_REPAIRS              = 0x0000000000000040,
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 424a176cf..ff3dee349 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -2939,100 +2939,6 @@
     </hwpfToHbAttrMap>
 </attribute>
 
-<!-- TODO: RTC 89378 remove MNFG_FLAG_BIT once MNFG_FLAG makes it into the
-          fsp build and references in hwsvHostSvc.H are updated -->
-<enumerationType>
-    <id>MNFG_FLAG_BIT</id>
-    <description>Enumeration indicating the mnfg flags
-        that are set by the user.  The values can be
-        combined using a bitwise 'OR'.  The values will
-        need to be kept in sync with the FAPI
-        enumerator values.  Also the enumeration type
-        is used by the ATTR_MNFG_FLAGS attribute.  Should
-        note that the MNFG_FLAG_BIT values are of type uint32_t
-    </description>
-    <enumerator>
-        <!-- Use default mfg error thresholds and reporting values -->
-        <name>MNFG_THRESHOLDS</name>
-        <value>0x00000001</value>
-    </enumerator>
-    <enumerator>
-        <!-- Enable AVP execution -->
-        <name>MNFG_AVP_ENABLE</name>
-        <value>0x00000002</value>
-    </enumerator>
-    <enumerator>
-        <!-- Enable HDAT AVPs** -->
-        <name>MNFG_HDAT_AVP_ENABLE</name>
-        <value>0x00000004</value>
-    </enumerator>
-    <enumerator>
-        <!-- All SRCs are terminating (CEC hardware/procedural) -->
-        <name>MNFG_SRC_TERM</name>
-        <value>0x00000008</value>
-    </enumerator>
-    <enumerator>
-        <!-- Enable IPL memory diagnostics to report memory CE -->
-        <name>MNFG_IPL_MEMORY_CE_CHECKINGE</name>
-        <value>0x00000010</value>
-    </enumerator>
-    <enumerator>
-        <!-- Enable Fast Background Scrub -->
-        <name>MNFG_FAST_BACKGROUND_SCRUB</name>
-        <value>0x00000020</value>
-    </enumerator>
-    <enumerator>
-        <!-- Test DRAM Repairs -->
-        <name>MNFG_TEST_DRAM_REPAIRS</name>
-        <value>0x00000040</value>
-    </enumerator>
-    <enumerator>
-        <!-- Disable Dram Repairs -->
-        <name>MNFG_DISABLE_DRAM_REPAIRS</name>
-        <value>0x00000080</value>
-    </enumerator>
-    <enumerator>
-        <!-- Enable exhaustive pattern test -->
-        <name>MNFG_ENABLE_EXHAUSTIVE_PATTERN_TEST</name>
-        <value>0x00000100</value>
-    </enumerator>
-    <enumerator>
-        <!-- Enable standard pattern test -->
-        <name>MNFG_ENABLE_STANDARD_PATTERN_TEST</name>
-        <value>0x00000200</value>
-    </enumerator>
-    <enumerator>
-        <!-- Enable minimum pattern test -->
-        <name>MNFG_ENABLE_MINIMUM_PATTERN_TEST</name>
-        <value>0x00000400</value>
-    </enumerator>
-    <enumerator>
-        <!-- Disable Fabric eRepair -->
-        <name>MNFG_DISABLE_FABRIC_eREPAIR</name>
-        <value>0x00000800</value>
-    </enumerator>
-    <enumerator>
-        <!-- Disable Memory eRepair -->
-        <name>MNFG_DISABLE_MEMORY_eREPAIR</name>
-        <value>0x00001000</value>
-    </enumerator>
-    <enumerator>
-        <!-- Fabric deploy lane spares -->
-        <name>MNFG_FABRIC_DEPLOY_LANE_SPARES</name>
-        <value>0x00002000</value>
-    </enumerator>
-    <enumerator>
-        <!-- DMI deploy lane spares -->
-        <name>MNFG_DMI_DEPLOY_LANE_SPARES</name>
-        <value>0x00004000</value>
-    </enumerator>
-    <enumerator>
-        <!-- Forcibly run PSI diagnostics -->
-        <name>MNFG_PSI_DIAGNOSTIC</name>
-        <value>0x00008000</value>
-    </enumerator>
-</enumerationType>
-
 <enumerationType>
     <id>MNFG_FLAG</id>
     <description>Enumeration indicating the mnfg flags