From e34e35d411bc1cdd314bff4cf86d913e1515d3ac Mon Sep 17 00:00:00 2001 From: Thi Tran Date: Mon, 21 Sep 2015 14:22:29 -0500 Subject: SW322509: INITPROC: FSP&Hostboot - HWP BEAM updates Change-Id: Idd4461cc3f10f772d1e7c7d9a7ad1398ffae02c1 CQ:SW322509 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20666 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Reviewed-by: A. Patrick Williams III --- .../hwp/build_winkle_images/p8_slw_build/p8_image_help_base.C | 8 +++++--- .../hwp/build_winkle_images/p8_slw_build/p8_slw_build_fixed.C | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src/usr/hwpf/hwp/build_winkle_images/p8_slw_build') diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_image_help_base.C b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_image_help_base.C index c0f190d93..eeb55dad0 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_image_help_base.C +++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_image_help_base.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2015 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -20,7 +22,7 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: p8_image_help_base.C,v 1.14 2013-08-01 13:34:16 dcrowell Exp $ +// $Id: p8_image_help_base.C,v 1.15 2015/09/14 17:04:35 cswenson Exp $ /*------------------------------------------------------------------------------*/ /* *! TITLE : p8_image_help_base.c */ /* *! DESCRIPTION : Basic helper functions for building and extracting */ @@ -248,7 +250,7 @@ int write_ring_block_to_image( void *io_image, // ------ // Temporarily copy .dcrings section if inserting into .rings section. - SbeXipSection xipSectionDcrings; + SbeXipSection xipSectionDcrings = SbeXipSection(); void *hostSectionDcrings=NULL; if (i_xipSectionId==SBE_XIP_SECTION_RINGS) { diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_slw_build_fixed.C b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_slw_build_fixed.C index f823ce874..4c5e953c5 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_slw_build_fixed.C +++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_slw_build_fixed.C @@ -22,7 +22,7 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: p8_slw_build_fixed.C,v 1.23 2014/09/11 22:47:00 cmolsen Exp $ +// $Id: p8_slw_build_fixed.C,v 1.24 2015/09/14 17:04:33 cswenson Exp $ /*------------------------------------------------------------------------------*/ /* *! TITLE : p8_slw_build_fixed */ /* *! DESCRIPTION : Extracts and decompresses delta ring states from EPROM */ @@ -462,7 +462,9 @@ ReturnCode p8_slw_build_fixed( const fapi::Target &i_target, } if (rcSearch==DSLWB_RING_SEARCH_MATCH || rcSearch==DSLWB_RING_SEARCH_EXHAUST_MATCH) + { FAPI_DBG("\tRetrieving RS4 delta ring was successful."); + } // // Check if we're done at this point, and save status in bSearchDone. -- cgit v1.2.1