diff options
| author | Dzuy Nguyen <dzuy@us.ibm.com> | 2017-06-12 15:50:59 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-20 11:22:55 -0400 |
| commit | 6a21eb6f2af481f12d6baee963e3f563123f5cde (patch) | |
| tree | a7c6e1518891c4c089a9a58e5b6dfb2863522132 | |
| parent | cd4a357c8126175172a41b03be680b3341f5bf74 (diff) | |
| download | talos-hostboot-6a21eb6f2af481f12d6baee963e3f563123f5cde.tar.gz talos-hostboot-6a21eb6f2af481f12d6baee963e3f563123f5cde.zip | |
Modify function names to avoid duplicate symbol errors
Change-Id: I2781e298b22cbc4c24cca8b00e2497b9316ce2b7
RTC: 174364
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41713
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41829
Reviewed-by: Hostboot Team <hostboot@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>
3 files changed, 6 insertions, 6 deletions
diff --git a/src/import/chips/p9/procedures/hwp/io/p9_io_obus_image_build.C b/src/import/chips/p9/procedures/hwp/io/p9_io_obus_image_build.C index a2b8b981f..5183eafdb 100644 --- a/src/import/chips/p9/procedures/hwp/io/p9_io_obus_image_build.C +++ b/src/import/chips/p9/procedures/hwp/io/p9_io_obus_image_build.C @@ -41,7 +41,7 @@ #include "p9_xip_image.h" //--------------------------------------------------------------------------- -fapi2::ReturnCode extractPpeImg(void* const iImagePtr, uint8_t*& oObusImgPtr, uint32_t& oSize) +fapi2::ReturnCode extractPpeImgObus(void* const iImagePtr, uint8_t*& oObusImgPtr, uint32_t& oSize) { FAPI_IMP("Entering getObusImageFromHwImage."); P9XipSection ppeSection; @@ -103,7 +103,7 @@ fapi2::ReturnCode p9_io_obus_image_build(CONST_OBUS& iTgt, void* const iHwImageP uint8_t* pObusImg = NULL; uint32_t imgSize = 0; - FAPI_TRY(extractPpeImg(iHwImagePtr, pObusImg, imgSize), "Extract PPE Image Failed."); + FAPI_TRY(extractPpeImgObus(iHwImagePtr, pObusImg, imgSize), "Extract PPE Image Failed."); // PPE Reset FAPI_TRY(scomWrite(iTgt, XCR_NONE, HARD_RESET), "Hard Reset Failed."); diff --git a/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_image_build.C b/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_image_build.C index c38d63861..e94b33b3e 100644 --- a/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_image_build.C +++ b/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_image_build.C @@ -41,7 +41,7 @@ #include "p9_xip_image.h" //--------------------------------------------------------------------------- -fapi2::ReturnCode extractPpeImg(void* const iImagePtr, uint8_t*& oPpeImgPtr, uint32_t& oSize) +fapi2::ReturnCode extractPpeImgXbus(void* const iImagePtr, uint8_t*& oPpeImgPtr, uint32_t& oSize) { FAPI_IMP("Entering getObusImageFromHwImage."); P9XipSection ppeSection; @@ -103,7 +103,7 @@ fapi2::ReturnCode p9_io_xbus_image_build(CONST_XBUS& iTgt, void* const iHwImageP uint8_t* pPpeImg = NULL; uint32_t imgSize = 0; - FAPI_TRY(extractPpeImg(iHwImagePtr, pPpeImg, imgSize), "Extract PPE Image Failed."); + FAPI_TRY(extractPpeImgXbus(iHwImagePtr, pPpeImg, imgSize), "Extract PPE Image Failed."); // PPE Reset FAPI_TRY(scomWrite(iTgt, XCR_NONE, HARD_RESET), "Hard Reset Failed."); diff --git a/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_image_build.H b/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_image_build.H index a2b241fa1..e9280ec08 100644 --- a/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_image_build.H +++ b/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_image_build.H @@ -25,7 +25,7 @@ #ifndef __IO_IOF_HCODE_IMG_BUILD_H_ #define __IO_IOF_HCODE_IMG_BUILD_H_ /// -/// @file p9_io_obus_image_build.H +/// @file p9_io_xbus_image_build.H /// @brief Implements HWP that builds the Hcode image in IO Xbus PPE Sram. ///---------------------------------------------------------------------------- /// *HWP HWP Owner : Chris Steffen <cwsteffen@us.ibm.com> @@ -45,7 +45,7 @@ typedef const fapi2::Target<fapi2::TARGET_TYPE_XBUS> CONST_XBUS; -typedef fapi2::ReturnCode (*p9_io_obus_image_build_FP_t)(CONST_XBUS&, void* const); +typedef fapi2::ReturnCode (*p9_io_xbus_image_build_FP_t)(CONST_XBUS&, void* const); extern "C" { |
