diff options
| author | Santosh Puranik <santosh.puranik@in.ibm.com> | 2016-06-09 07:52:34 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-07-31 23:29:07 -0400 |
| commit | 590dc5424c21b50b70d1095133e885a0f860cdda (patch) | |
| tree | c483bff571c246ca5e919876bf5d49c038dfbf2b /sbe | |
| parent | bc8b0c5daeb285c95749ddb31203a8ed2994a7d3 (diff) | |
| download | talos-sbe-590dc5424c21b50b70d1095133e885a0f860cdda.tar.gz talos-sbe-590dc5424c21b50b70d1095133e885a0f860cdda.zip | |
Changes for local-only SBE ffdc collection
-Update parseErrorInfo.pl to only pick up
<ffdc> taged items
-Reduce class footprint to size acceptable
to sbe environment
Change-Id: Ia969ce649e9c0891d7a01de12438a626dfecb163
RTC:154307
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25463
Reviewed-by: Santosh S. Puranik <santosh.puranik@in.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'sbe')
| -rw-r--r-- | sbe/hwpf/src/fapi2sbefiles.mk | 1 | ||||
| -rw-r--r-- | sbe/hwpf/src/ffdc.C | 42 | ||||
| -rw-r--r-- | sbe/image/Makefile | 2 | ||||
| -rw-r--r-- | sbe/image/img_defs.mk | 9 |
4 files changed, 51 insertions, 3 deletions
diff --git a/sbe/hwpf/src/fapi2sbefiles.mk b/sbe/hwpf/src/fapi2sbefiles.mk index ada060cd..edbceab0 100644 --- a/sbe/hwpf/src/fapi2sbefiles.mk +++ b/sbe/hwpf/src/fapi2sbefiles.mk @@ -41,6 +41,7 @@ # Object Files ########################################################################## +FAPI2-C-SOURCES += ffdc.C FAPI2-C-SOURCES += plat_ring_traverse.C FAPI2-S-SOURCES = diff --git a/sbe/hwpf/src/ffdc.C b/sbe/hwpf/src/ffdc.C new file mode 100644 index 00000000..8843b7bd --- /dev/null +++ b/sbe/hwpf/src/ffdc.C @@ -0,0 +1,42 @@ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: sbe/hwpf/src/ffdc.C $ */ +/* */ +/* OpenPOWER sbe Project */ +/* */ +/* Contributors Listed Below - COPYRIGHT 2016 */ +/* [+] 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. */ +/* You may obtain a copy of the License at */ +/* */ +/* http://www.apache.org/licenses/LICENSE-2.0 */ +/* */ +/* Unless required by applicable law or agreed to in writing, software */ +/* distributed under the License is distributed on an "AS IS" BASIS, */ +/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ +/* implied. See the License for the specific language governing */ +/* permissions and limitations under the License. */ +/* */ +/* IBM_PROLOG_END_TAG */ +/** + * @file ffdc.C + * @brief Implements the ffdc for sbe + */ + +#include <ffdc.H> +#include <error_info.H> + + +namespace fapi2 +{ + +#ifdef MINIMUM_FFDC + // buffer used to hold ffdc data + SbeFfdcData_t g_FfdcData; +#endif + +}; diff --git a/sbe/image/Makefile b/sbe/image/Makefile index d61f6be5..1fc49406 100644 --- a/sbe/image/Makefile +++ b/sbe/image/Makefile @@ -309,7 +309,7 @@ ppe_trace_bin: xml: $(FAPI_RC) $(FAPI_RC): $(TOOLS_ATTR_DIR)/parseErrorInfo.pl $(ERROR_XML_FILES) - $(TOOLS_ATTR_DIR)/parseErrorInfo.pl --empty-ffdc-classes --output-dir=. $(ERROR_XML_FILES) + $(TOOLS_ATTR_DIR)/parseErrorInfo.pl --local-ffdc --output-dir=. $(ERROR_XML_FILES) $(OBJDIR)/fixed.bin: $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin extract .fixed $(BASE_OBJDIR)/fixed.bin diff --git a/sbe/image/img_defs.mk b/sbe/image/img_defs.mk index 99ca895b..80bfe04d 100644 --- a/sbe/image/img_defs.mk +++ b/sbe/image/img_defs.mk @@ -133,6 +133,7 @@ ifndef PK_SRCDIR export PK_SRCDIR = $(abspath ../../pk) endif + ifndef TOOLS_ATTR_DIR export TOOLS_ATTR_DIR = $(abspath ../../tools/scripts) endif @@ -173,6 +174,10 @@ ifndef BASE_FAPI2_DIR export BASE_FAPI2_DIR = $(abspath ../../import/hwpf/fapi2) endif +ifndef FAPI2_TOOLS_DIR +export FAPI2_TOOLS_DIR = $(abspath ../../import/hwpf/fapi2/tools/) +endif + ifdef P2P_ENABLE ifndef CC_ROOT export CC_ROOT = ${CTEPATH}/tools/gcc405lin/prod @@ -276,7 +281,7 @@ GCC-DEFS += -DUSE_PK_APP_CFG_H=1 GCC-DEFS += -D__PK__=1 GCC-DEFS += -D__SBE__=1 GCC-DEFS += -D__PPE__=1 -GCC-DEFS += -DFAPI2_NO_FFDC=1 +GCC-DEFS += -DMINIMUM_FFDC=1 GCC-DEFS += -DFAPI_TRACE_LEVEL=$(FAPI_TRACE_LEVEL_DEF) # use the default settings in the code unless a size is defined ifdef PK_TRACE_SZ @@ -289,7 +294,7 @@ export LD_LIBRARY_PATH+=:$(GCC-TOOL-PATH)/lib INCLUDES += $(IMG_INCLUDES) -INCLUDES += -I$(IMAGE_SRCDIR)/../../../include +INCLUDES += -I$(IMAGE_SRCDIR)/../../include INCLUDES += -I$(HWPLIB_SRCDIR) INCLUDES += -I$(PLAT_FAPI2_DIR)/include/plat INCLUDES += -I$(PLAT_FAPI2_DIR)/include |
