From fa156b4bd3444e489dd910dc86e9bff718e1fbfd Mon Sep 17 00:00:00 2001 From: Dean Sanner Date: Fri, 3 Feb 2017 20:59:31 -0600 Subject: 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 Reviewed-by: Martin Gloff Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell Reviewed-by: William G. Hoffa --- src/usr/sbe/sbe_update.C | 4 +++- src/usr/targeting/common/xmltohb/attribute_types.xml | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/usr') 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 Provided by the platform. HB_IPL = 0x1,HB_RUNTIME = 0x2,CACHE_CONTAINED = 0x4 - + + 0x01 + ATTR_SYSTEM_IPL_PHASE DIRECT - volatile-zeroed + non-volatile -- cgit v1.2.1