diff options
| author | Elizabeth Liner <eliner@us.ibm.com> | 2016-07-07 12:48:13 -0500 |
|---|---|---|
| committer | Stephen Cprek <smcprek@us.ibm.com> | 2016-07-18 15:32:28 -0500 |
| commit | 80bdd0b88c6d43dbb41025ed893a82ee4abd6f32 (patch) | |
| tree | fae5084078ed447a26d41566e7b9a332cc63d59a /src/usr/pnor/common/ffs_hb.H | |
| parent | 8f5b9a2108a009e93cea373b78474026e3cce9b9 (diff) | |
| download | talos-hostboot-80bdd0b88c6d43dbb41025ed893a82ee4abd6f32.tar.gz talos-hostboot-80bdd0b88c6d43dbb41025ed893a82ee4abd6f32.zip | |
Changing XZ decompressor to verify without pnor changes
This patch set is reverting previous pnor changes for XZ
verification, and instead is checking the MAGIC_HEADER to
verify if a section is XZ compressed.
Change-Id: I17c6ec76aef0261e07042f91df550ef34c3d60b3
RTC:149915
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26728
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/pnor/common/ffs_hb.H')
| -rw-r--r-- | src/usr/pnor/common/ffs_hb.H | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/usr/pnor/common/ffs_hb.H b/src/usr/pnor/common/ffs_hb.H index a7f579129..62e2ad785 100644 --- a/src/usr/pnor/common/ffs_hb.H +++ b/src/usr/pnor/common/ffs_hb.H @@ -52,8 +52,7 @@ enum FFS_CHIPSEL_UNUSED = 0xFF, /**< Chip select not used */ /* Compression : 1 byte */ - FFS_COMPRESS_XZ = 0x80, /**< Section is XZ compressed */ - FFS_COMPRESS_UNUSED = 0x7F, /**< Compression not used */ + FFS_COMPRESS_UNUSED = 0xFF, /**< Compression not used */ /* Data Integrity : 2 bytes */ FFS_INTEG_ECC_PROTECT = 0x8000, /**< Data Integrity: ECC protected */ @@ -83,8 +82,7 @@ struct ffs_hb_user_t{ uint8_t verCheck; /**< Indicates Version check type */ uint8_t miscFlags; /**< Misc Partition related Flags */ uint8_t freeMisc[2]; /**< Unused Miscellaneious Info */ - uint32_t decompressSize; /**< Size after data is uncompressed in bytes */ - uint32_t freeUser[12]; /**< Unused User Data */ + uint32_t freeUser[13]; /**< Unused User Data */ } PACKED; |
