From 80bdd0b88c6d43dbb41025ed893a82ee4abd6f32 Mon Sep 17 00:00:00 2001 From: Elizabeth Liner Date: Thu, 7 Jul 2016 12:48:13 -0500 Subject: 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 Tested-by: FSP CI Jenkins Reviewed-by: William G. Hoffa --- src/include/usr/isteps/istep21list.H | 1 - src/include/usr/pnor/pnor_const.H | 2 -- 2 files changed, 3 deletions(-) (limited to 'src/include') diff --git a/src/include/usr/isteps/istep21list.H b/src/include/usr/isteps/istep21list.H index c977b951e..b5aa22fb8 100644 --- a/src/include/usr/isteps/istep21list.H +++ b/src/include/usr/isteps/istep21list.H @@ -122,7 +122,6 @@ const DepModInfo g_istep21Dependancies = { DEP_LIB(libistep21.so), DEP_LIB(libdevtree.so), DEP_LIB(libruntime.so), - DEP_LIB(libxz.so), NULL } }; diff --git a/src/include/usr/pnor/pnor_const.H b/src/include/usr/pnor/pnor_const.H index 88f0b8ab4..1dd598085 100644 --- a/src/include/usr/pnor/pnor_const.H +++ b/src/include/usr/pnor/pnor_const.H @@ -85,8 +85,6 @@ struct SectionInfo_t bool sha512Version; /**< Version Checking */ bool sha512perEC; /**< Version Checking perEC */ bool readOnly; /**< Section is read only */ - bool xzCompressed; /**< Section is XZ compressed */ - uint32_t xzSize; /**< Size of uncompressed partition in bytes */ }; /** -- cgit v1.2.1