diff options
| author | Dean Sanner <dsanner@us.ibm.com> | 2017-02-03 20:59:31 -0600 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-02-06 16:15:41 -0500 |
| commit | fa156b4bd3444e489dd910dc86e9bff718e1fbfd (patch) | |
| tree | e8d15e6ae65262360a3f3a1e4d707dbdd5b22548 /src/usr | |
| parent | 503d29385b07da37749c5ec69aba745223a029ae (diff) | |
| download | talos-hostboot-fa156b4bd3444e489dd910dc86e9bff718e1fbfd.tar.gz talos-hostboot-fa156b4bd3444e489dd910dc86e9bff718e1fbfd.zip | |
Updates to allow SBE update to work for OpenPOWER
- RINGOVD partition is optional, don't error out on it
- Default ATTR_SYSTEM_IPL_PHASE to HB IPL PHASE
Change-Id: Ia672617713aee9e35345c76aab0bba96bc999024
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35950
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/sbe/sbe_update.C | 4 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 52818337e..69ffaec84 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -1070,9 +1070,11 @@ namespace SBE l_err = PNOR::getSectionInfo(PNOR::RINGOVD, l_pnorRingOvd); if(l_err) { + delete l_err; + l_err = NULL; TRACFCOMP( g_trac_sbe, ERR_MRK"ringOvd():Error trying to read RINGOVD " - "from PNOR!"); + "from PNOR. It is optional, continuing"); io_ovdImgSize = 0; break; } diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 6f7af50ce..9b74f0856 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -21121,13 +21121,15 @@ Measured in GB</description> Provided by the platform. HB_IPL = 0x1,HB_RUNTIME = 0x2,CACHE_CONTAINED = 0x4</description> <simpleType> - <uint8_t></uint8_t> + <uint8_t> + <default>0x01</default> + </uint8_t> </simpleType> <hwpfToHbAttrMap> <id>ATTR_SYSTEM_IPL_PHASE</id> <macro>DIRECT</macro> </hwpfToHbAttrMap> - <persistency>volatile-zeroed</persistency> + <persistency>non-volatile</persistency> <readable/> <writeable/> </attribute> |
