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>
open-power · Feb 6, 2017 · fa156b4 · fa156b4
1 parent 503d293
commit fa156b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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>