Reduce SBE image size

1. Removed get capabilities
2. Removed state machine check for chip-ops

Change-Id: Idc1d497d50af645f62ff44d8f7143347c4467767
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41098
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

4 files changed, 16 insertions, 2 deletions

diff --git a/src/sbefw/sbecmdgeneric.C b/src/sbefw/sbecmdgeneric.C
index 78bd5f23..30a8042c 100644
--- a/src/sbefw/sbecmdgeneric.C
+++ b/src/sbefw/sbecmdgeneric.C
@@ -102,6 +102,7 @@ sbeCapabilityRespMsg::sbeCapabilityRespMsg()
 }
 // Functions
 //----------------------------------------------------------------------------
+#ifdef DD2
 uint32_t sbeGetCapabilities (uint8_t *i_pArg)
 {
     #define SBE_FUNC "sbeGetCapabilities "
@@ -141,6 +142,7 @@ uint32_t sbeGetCapabilities (uint8_t *i_pArg)
     return rc;
     #undef SBE_FUNC
 }
+#endif
 
 
 // Functions
diff --git a/src/sbefw/sbecmdgeneric.H b/src/sbefw/sbecmdgeneric.H
index 63f7d104..94bbb91b 100644
--- a/src/sbefw/sbecmdgeneric.H
+++ b/src/sbefw/sbecmdgeneric.H
@@ -43,6 +43,7 @@
   */
 uint32_t sbeGetFfdc(uint8_t *i_pArg);
 
+#ifdef DD2
 /**
   * @brief SBE Generic capabilities  (0xA802)
   *
@@ -51,6 +52,7 @@ uint32_t sbeGetFfdc(uint8_t *i_pArg);
   * @return    Rc from the FIFO access utility
   */
 uint32_t sbeGetCapabilities(uint8_t *i_pArg);
+#endif
 
 /**
   * @brief SBE Fifo Quiesce (0xA806)
diff --git a/src/sbefw/sbecmdparser.C b/src/sbefw/sbecmdparser.C
index 7a1f2ccc..2d1efef1 100644
--- a/src/sbefw/sbecmdparser.C
+++ b/src/sbefw/sbecmdparser.C
@@ -104,10 +104,12 @@ static sbeCmdStruct_t g_sbeIplControlCmdArray [] =
 ////////////////////////////////////////////////////////////////
 static sbeCmdStruct_t g_sbeGenericCmdArray [] =
 {
+#ifdef DD2
     {sbeGetCapabilities,
      SBE_CMD_GET_SBE_CAPABILITIES,
      SBE_NO_FENCE,
     },
+#endif
 
      {sbeGetFfdc,
       SBE_CMD_GET_SBE_FFDC,
@@ -448,9 +450,10 @@ bool sbeIsCmdAllowedAtState (const uint8_t i_cmdClass,
                              const uint8_t i_cmdOpcode)
 {
     #define SBE_FUNC " sbeIsCmdAllowedAtState "
+    bool l_ret = true;
+#ifdef DD2
     uint8_t l_numCmds = 0;
     sbeCmdStruct_t *l_pCmd = NULL;
-    bool l_ret = false;
     l_numCmds = sbeGetCmdStructAttr (i_cmdClass, &l_pCmd);
 
     for (uint8_t l_cnt = 0; l_cnt < l_numCmds; ++l_cnt, ++l_pCmd)
@@ -520,10 +523,13 @@ bool sbeIsCmdAllowedAtState (const uint8_t i_cmdClass,
                     break;
                 }
 
-                default: break;
+                default:
+                    l_ret = false;
+                    break;
             }
         }
     }
+#endif
     // For any other state, which is not handled above, return from here
     return l_ret;
     #undef SBE_FUNC
diff --git a/src/test/testcases/testGetCapabilities.py b/src/test/testcases/testGetCapabilities.py
index a01975c2..cc66ecf1 100755
--- a/src/test/testcases/testGetCapabilities.py
+++ b/src/test/testcases/testGetCapabilities.py
@@ -58,6 +58,10 @@ EXPDATA3 = [0xa8,0x0,0x0,0x13, #getcapability/getSbeFFDC/quiesce
 # MAIN Test Run Starts Here...
 #-------------------------------------------------
 def main( ):
+    ( rc, out )  =   quiet_run_command( "sbe-ddlevel 0", output_modes.regular )
+    if(rc == "DD1"):
+        print "Not running Get Capabilities on DD1"
+        return
     testUtil.runCycles( 10000000 )
     testUtil.writeUsFifo( TESTDATA )
     testUtil.writeEot( )