Deliver new PNOR tooling to ODE sandbox

Updating pnor build process in the following ways:
-Murano/Venice/Tuleta pnor images now build in ODE sandbox
-They are built using the ffs tool
-hbDistribute delivers necessary files to ODE to
  enable building in ODE sandbox.
-Delivering ffs_hb.H to CMVC to enable commonality
  of FFS user data with Hardware Server
-Disabled failing Scom test case assoicated with new
  bbuild.  Opened Issue to track resolution.

Note, VBU image is still built the old way.  That will be
updated next sprint.

Change-Id: Ie4cdca053c3f4221e5ca051a68157159970dfce2
RTC: 35045
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1436
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/usr/pnor/pnorrp.C b/src/usr/pnor/pnorrp.C
index d84c636e5..c2287a4a8 100644
--- a/src/usr/pnor/pnorrp.C
+++ b/src/usr/pnor/pnorrp.C
@@ -35,6 +35,8 @@
 #include <errno.h>
 #include <initservice/initserviceif.H>
 #include "pnordd.H"
+#include "ffs.h"   //Common header file with BuildingBlock.
+#include "common/ffs_hb.H" //Hostboot definition of user data in ffs_entry struct.
 
 // Trace definition
 trace_desc_t* g_trac_pnor = NULL;
@@ -318,7 +320,7 @@ errlHndl_t PnorRP::getSectionInfo( PNOR::SectionId i_section,
     o_info.name = cv_EYECATCHER[id];
     o_info.vaddr = iv_TOC[side][id].virtAddr;
     o_info.size = iv_TOC[side][id].size;
-    o_info.eccProtected = (bool)(iv_TOC[side][id].miscFlags & MISC_ECC_PROTECT);
+    o_info.eccProtected = (bool)(iv_TOC[side][id].miscFlags & FFS_MISC_ECC_PROTECT);
 
     return l_errhdl;
 }
@@ -453,7 +455,7 @@ errlHndl_t PnorRP::readTOC()
             //virtAddr
             //The PNOR data is broken up into 3 blocks of Virtual Addresses, A, B, and Sideless.
             //For Sections found to be sideless, both PNOR sides will map to the same virtual address.
-            if(!(ffsUserData->miscFlags & MISC_SIDELESS))
+            if(!(ffsUserData->miscFlags & FFS_MISC_SIDELESS))
             {
                 iv_TOC[cur_side][secId].virtAddr = nextVAddr[cur_side];  
                 nextVAddr[cur_side] += iv_TOC[cur_side][secId].size; 
@@ -777,7 +779,7 @@ errlHndl_t PnorRP::computeDeviceAddr( void* i_vaddr,
 
     // pull out the information we need to return from our global copy
     o_chip = iv_TOC[side][id].chip;
-    o_ecc = (bool)(iv_TOC[side][id].miscFlags & MISC_ECC_PROTECT);
+    o_ecc = (bool)(iv_TOC[side][id].miscFlags & FFS_MISC_ECC_PROTECT);
     o_offset = l_vaddr - iv_TOC[side][id].virtAddr; //offset into pnor
     o_offset += iv_TOC[side][id].flashAddr;