Define User Data bits in PNOR TOC

Change-Id: Ie2bc561c2cfdbea32ba08d9e74bf1f36cf1f43cd
RTC: 66209
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4687
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 39 insertions, 31 deletions

diff --git a/src/usr/pnor/common/ffs_hb.H b/src/usr/pnor/common/ffs_hb.H
index 489e65434..6174c24ee 100644
--- a/src/usr/pnor/common/ffs_hb.H
+++ b/src/usr/pnor/common/ffs_hb.H
@@ -1,26 +1,25 @@
-/*  IBM_PROLOG_BEGIN_TAG
- *  This is an automatically generated prolog.
- *
- *  $Source: src/usr/pnor/common/ffs_hb.H $
- *
- *  IBM CONFIDENTIAL
- *
- *  COPYRIGHT International Business Machines Corp. 2012
- *
- *  p1
- *
- *  Object Code Only (OCO) source materials
- *  Licensed Internal Code Source Materials
- *  IBM HostBoot Licensed Internal Code
- *
- *  The source code for this program is not published or other-
- *  wise divested of its trade secrets, irrespective of what has
- *  been deposited with the U.S. Copyright Office.
- *
- *  Origin: 30
- *
- *  IBM_PROLOG_END_TAG
- */
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/pnor/common/ffs_hb.H $                                */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012,2013              */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
 #ifndef _FFS_HB_H
 #define _FFS_HB_H
 
@@ -47,9 +46,17 @@
  */
 enum
 {
-    FFS_MISC_ECC_PROTECT   = 0x80,    /**< ECC protected */
-    FFS_MISC_SIDELESS      = 0x40,    /**< Preserved across code updates (sideless) =1 */
-    FFS_MISC_CRC_PROTECTED = 0x20,    /**< CRC protected */
+    FFS_CHIPSEL_UNUSED     = 0xFF,    /**< Chip select not used */
+    FFS_COMPRESS_UNUSED    = 0xFF,    /**< Compression not used  */
+
+    FFS_INTEG_ECC_PROTECT  = 0x8000,  /**< Data Integrity: ECC protected */
+    FFS_INTEG_UNUSED       = 0x1FFF,  /**< Unused Data Integrity Bits */
+
+    FFS_VERS_SHA512        = 0x80,    /**< SHA512 used for Version */
+    FFS_VERS_SHA512_PER_EC = 0x40,    /**< SHA512 version per EC */
+    FFS_VERS_UNUSED        = 0x3F,    /**< Unused Version bits */
+
+    FFS_MISC_PRESERVED      = 0x80,    /**< Preserved across code updates */
     FFS_MISC_UNUSED        = 0x1F,    /**< Unused MISC Flags */
 };
 
@@ -58,11 +65,12 @@ enum
  *   This matches the PNOR binary layout of the data[] in an ffs_entry.
  */
 struct ffs_hb_user_t{
-    uint32_t sizeAct;      /**< Actual Size of the image */
-    uint8_t chip;          /**< Chip Select (0,1) */
-    uint8_t compressType;  /**< Compression Indication/alg (0=not compressed) */
-    uint8_t miscFlags;     /**< Misc Partition related Flags */
-    uint8_t freeMisc[5];   /**< Unused Miscellaneious Info */
+    uint8_t  chip;         /**< Chip Select (0,1) */
+    uint8_t  compressType; /**< Compression Indication/alg (0=not compressed) */
+    uint16_t dataInteg;    /**< Indicates Data Integrity mechanism */
+    uint8_t  verCheck;     /**< Indicates Version check type */
+    uint8_t  miscFlags;    /**< Misc Partition related Flags */
+    uint8_t  freeMisc[2];  /**< Unused Miscellaneious Info */
     uint32_t freeUser[13]; /**< Unused User Data */
 } PACKED;