Cleanup enum MNFG_FLAG_BIT_MNFG_IPL_MEMORY_CE_CHECKINGE

There are 3 steps. This is step 1.
Step 1: "Add" typo fix for CHECKING and "Add" shorter enumeration names without
the redundant "BIT_MNFG_" to common targeting files. Fix host boot only files.

Once common targeting files are in FSP build...
Step 2a: Update FSP side including prd common file
Step 2b: Remove CHECKINGE typo and long enumeration names from common targeting
files. Fix up common prd host boot file

Change-Id: I3619a2389d421026b5bf3dd0df53113ee7d9a034
RTC: 89378
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8593
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

5 files changed, 10 insertions, 8 deletions

diff --git a/src/usr/diag/mdia/mdia.C b/src/usr/diag/mdia/mdia.C
index aea2bce05..66a92a7fe 100644
--- a/src/usr/diag/mdia/mdia.C
+++ b/src/usr/diag/mdia/mdia.C
@@ -71,7 +71,7 @@ errlHndl_t runStep(const TargetHandleList & i_targetList)
         if(maxMemPatterns)
         {
             globals.mfgPolicy |=
-              MNFG_FLAG_BIT_MNFG_ENABLE_EXHAUSTIVE_PATTERN_TEST;
+              MNFG_FLAG_ENABLE_EXHAUSTIVE_PATTERN_TEST;
         }
 
         globals.simicsRunning = Util::isSimicsRunning();
diff --git a/src/usr/diag/mdia/mdiamba.C b/src/usr/diag/mdia/mdiamba.C
index ebb4587e5..1b73d54f8 100644
--- a/src/usr/diag/mdia/mdiamba.C
+++ b/src/usr/diag/mdia/mdiamba.C
@@ -50,19 +50,19 @@ errlHndl_t getMbaDiagnosticMode(
             o_mode = ONE_PATTERN;
         }
 
-        else if(MNFG_FLAG_BIT_MNFG_ENABLE_EXHAUSTIVE_PATTERN_TEST
+        else if(MNFG_FLAG_ENABLE_EXHAUSTIVE_PATTERN_TEST
            & i_globals.mfgPolicy)
         {
             o_mode = NINE_PATTERNS;
         }
 
-        else if(MNFG_FLAG_BIT_MNFG_ENABLE_STANDARD_PATTERN_TEST
+        else if(MNFG_FLAG_ENABLE_STANDARD_PATTERN_TEST
                 & i_globals.mfgPolicy)
         {
             o_mode = FOUR_PATTERNS;
         }
 
-        else if(MNFG_FLAG_BIT_MNFG_ENABLE_MINIMUM_PATTERN_TEST
+        else if(MNFG_FLAG_ENABLE_MINIMUM_PATTERN_TEST
                 & i_globals.mfgPolicy)
         {
             o_mode = ONE_PATTERN;
@@ -138,7 +138,7 @@ errlHndl_t getMbaWorkFlow(
             break;
     }
 
-    if(MNFG_FLAG_BIT_MNFG_IPL_MEMORY_CE_CHECKINGE
+    if(MNFG_FLAG_IPL_MEMORY_CE_CHECKING
             & i_globals.mfgPolicy)
     {
         o_wf.push_back(ANALYZE_IPL_MNFG_CE_STATS);
diff --git a/src/usr/diag/mdia/mdiasm.C b/src/usr/diag/mdia/mdiasm.C
index a140c2561..f62d3f566 100644
--- a/src/usr/diag/mdia/mdiasm.C
+++ b/src/usr/diag/mdia/mdiasm.C
@@ -778,7 +778,7 @@ errlHndl_t StateMachine::doMaintCommand(WorkFlowProperties & i_wfp)
             break;
         }
 
-        if( TARGETING::MNFG_FLAG_BIT_MNFG_IPL_MEMORY_CE_CHECKINGE & mfgPolicy )
+        if( TARGETING::MNFG_FLAG_IPL_MEMORY_CE_CHECKING & mfgPolicy )
         {
             // For MNFG mode, check CE also
             stopCondition |= mss_MaintCmd::STOP_ON_HARD_NCE_ETE;
diff --git a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
index 24ef31040..099634f0c 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
@@ -1380,6 +1380,8 @@ bool isMnfgFlagSet( uint32_t i_flag )
 
 //------------------------------------------------------------------------------
 
+// TODO: RTC 89378 remove "BIT_MNFG" and remove E from "CHECKING" once
+//       the attribute_types update is in the fsp build
 bool mfgMode()
 { return isMnfgFlagSet( MNFG_FLAG_BIT_MNFG_THRESHOLDS      ); }
 
diff --git a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.H b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.H
index 2bcbda38d..b16a21cf5 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.H
+++ b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.H
@@ -438,8 +438,8 @@ bool enableFastBgScrub();
 bool mnfgSpareDramDeploy();
 
 /**
- * @brief  Returns the state of the MNFG_IPL_MEMORY_CE_CHECKINGE policy flag.
- * @return TRUE if MNFG_IPL_MEMORY_CE_CHECKINGE is set, FALSE otherwise.
+ * @brief  Returns the state of the MNFG_IPL_MEMORY_CE_CHECKING policy flag.
+ * @return TRUE if MNFG_IPL_MEMORY_CE_CHECKING is set, FALSE otherwise.
  */
 bool isMfgCeCheckingEnabled();