summaryrefslogtreecommitdiffstats
path: root/src/usr/fapi2/fapi2.mk
diff options
context:
space:
mode:
authorRichard J. Knight <rjknight@us.ibm.com>2016-07-11 15:59:17 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2016-08-12 09:48:43 -0400
commit333bd2d69881f31cf6db145c33daf94c23397f9f (patch)
treefeaf1e28be98a9c1f2b49ce7b57ad577a2dff62c /src/usr/fapi2/fapi2.mk
parent8a32eec46393c1dcd479af6c8815852494d39cf5 (diff)
downloadtalos-hostboot-333bd2d69881f31cf6db145c33daf94c23397f9f.tar.gz
talos-hostboot-333bd2d69881f31cf6db145c33daf94c23397f9f.zip
Update parseErrorInfo.pl to support collectFfdc tags for SBE
-Modified script to enable passing back from the SBE parameters for the collectFfdc fuction -Added sample code for collectFfdc tags to proc_example_errors.xml -Added sample collectFfdc function p9_collect_some_ffdc -Fixed compile issue in fapi2_variable_buffer_test which was a result of changes to the hwp_ffdc_classes generated by the script. Change-Id: I6abbbc05ed38e368eb0ff586a22cc5aba824bad4 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27048 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: Deepak Kodihalli <dkodihal@in.ibm.com> Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27459 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/fapi2/fapi2.mk')
-rwxr-xr-xsrc/usr/fapi2/fapi2.mk15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/usr/fapi2/fapi2.mk b/src/usr/fapi2/fapi2.mk
index a94852a06..cede92727 100755
--- a/src/usr/fapi2/fapi2.mk
+++ b/src/usr/fapi2/fapi2.mk
@@ -37,6 +37,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/
EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/
EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/
EXTRAINCDIR += $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/
+EXTRAINCDIR += $(ROOTPATH)/src/import/chips/p9/procedures/hwp/ffdc/
EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/accessors/
include ${ROOTPATH}/src/build/mkrules/verbose.rules.mk
@@ -66,6 +67,7 @@ include ${HWP_PATH}/hwp/accessors/p9_get_mem_vpd_keyword.mk
OBJS += error_info.o
OBJS += ffdc.o
OBJS += fapi2_utils.o
+OBJS += p9_collect_some_ffdc.o
#Generated Objects
OBJS += fapi2_attribute_service.o
@@ -103,17 +105,11 @@ FAPI2_PLAT_INCLUDE += $(addsuffix /common/include, \
#------------------------------------------------------------------------------
# The PLAT HWP RC and FFDC parser file generated from Error XML files
#------------------------------------------------------------------------------
-PLAT_HWP_ERR_PARSER_TARGET = hbfwPlatHwpErrParser.H
-PLAT_HWP_ERR_PARSER_FFDC_TARGET = hbfwPlatHwpErrParserFFDC.H
-
+PLAT_HWP_ERR_PARSER = platHwpErrParser.H
GENDIR_PLUGINS = $(ROOTPATH)/obj/genfiles/plugins
GENPLUGINTARGET = $(addprefix $(GENDIR_PLUGINS)/, $(1))
-GENFILES_PLUGINS = ${PLAT_HWP_ERR_PARSER_TARGET}
-GENFILES_PLUGINS += ${PLAT_HWP_ERR_PARSER_FFDC_TARGET}
-
-
-$(call GENPLUGINTARGET, ${PLAT_HWP_ERR_PARSER_TARGET}) \
-$(call GENPLUGINTARGET, ${PLAT_HWP_ERR_PARSER_FFDC_TARGET}) : \
+GENFILES_PLUGINS = ${PLAT_HWP_ERR_PARSER}
+$(call GENPLUGINTARGET, ${PLAT_HWP_ERR_PARSER}) : \
$(ROOTPATH)/src/usr/fapi2/platCreateHwpErrParser.pl ${FAPI2_ERROR_XML}
$< $(dir $@) ${FAPI2_ERROR_XML}
@@ -133,4 +129,5 @@ include $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundv_bucke
VPATH += ${HWP_PATH}/hwp/accessors
VPATH += ${ROOTPATH}/src/import/hwpf/fapi2/src/
VPATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/pm/
+VPATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/ffdc/
VPATH += ${GENPATH}
OpenPOWER on IntegriCloud