diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2016-02-05 10:35:21 -0600 |
|---|---|---|
| committer | Matthew A. Ploetz <maploetz@us.ibm.com> | 2017-03-08 09:12:32 -0500 |
| commit | 6f2a36c73cfbc18d0d6bf86a45c63014fe12fd1d (patch) | |
| tree | 0a14231cf654b6610a3a922754fbcf470e5e96dd /src/usr/pnor | |
| parent | 04e001c3139323868eafb1742160fb7e76d9e1fd (diff) | |
| download | blackbird-hostboot-6f2a36c73cfbc18d0d6bf86a45c63014fe12fd1d.tar.gz blackbird-hostboot-6f2a36c73cfbc18d0d6bf86a45c63014fe12fd1d.zip | |
Support Provisioning PNOR partition XML element.
If the element is present, set a flag in the PNOR TOC. Other
code, like BMC code, would then erase these partitions when
the system is reprovisioned.
RTC: 143305
Forwardport: yes
Change-Id: I457895f65d81e0a971bf301f16be2921dc21a24a
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/20576
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
Diffstat (limited to 'src/usr/pnor')
| -rw-r--r-- | src/usr/pnor/common/ffs_hb.H | 5 | ||||
| -rw-r--r-- | src/usr/pnor/pnorrp.C | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/usr/pnor/common/ffs_hb.H b/src/usr/pnor/common/ffs_hb.H index 62e2ad785..7203880c9 100644 --- a/src/usr/pnor/common/ffs_hb.H +++ b/src/usr/pnor/common/ffs_hb.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* Contributors Listed Below - COPYRIGHT 2012,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -67,8 +67,9 @@ enum FFS_MISC_PRESERVED = 0x80, /**< Preserved across code updates */ FFS_MISC_READ_ONLY = 0x40, /**< Read only section */ FFS_MISC_PSEUDO = 0x20, /**< Pseudo partition */ + FFS_MISC_REPROVISION = 0x10, /**< Erased during reprovision */ FFS_MISC_GOLDEN = 0x01, /**< Golden side of PNOR */ - FFS_MISC_UNUSED = 0x1E, /**< Unused MISC Flags */ + FFS_MISC_UNUSED = 0x0E, /**< Unused MISC Flags */ }; /** diff --git a/src/usr/pnor/pnorrp.C b/src/usr/pnor/pnorrp.C index 15739c3bc..6bca58f25 100644 --- a/src/usr/pnor/pnorrp.C +++ b/src/usr/pnor/pnorrp.C @@ -617,11 +617,8 @@ errlHndl_t PnorRP::getSectionInfo( PNOR::SectionId i_section, != 0) ? true : false; o_info.readOnly = ((iv_TOC[id].misc & FFS_MISC_READ_ONLY) != 0) ? true : false; -// TODO securebootp9 the following field does not exist in p9. If the field is -// to be added to p9 we need to enable this line at that time, or remove and -// replace with appropriate code. -// o_info.reprovision = ((iv_TOC[id].misc & FFS_MISC_REPROVISION) -// != 0) ? true : false; + o_info.reprovision = ((iv_TOC[id].misc & FFS_MISC_REPROVISION) + != 0) ? true : false; } } while(0); |
