summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Horton <brianh@linux.ibm.com>2013-07-22 13:30:57 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2013-07-30 16:35:39 -0500
commit700cca7a165b5886876d792f2f87dc2c3a5b8327 (patch)
tree5cc7b45f6a0a3e4236f121ec2c3980b17ccec3bc /src
parent8bd7985c3ffa660b4712643a060c826af99d8949 (diff)
downloadblackbird-hostboot-700cca7a165b5886876d792f2f87dc2c3a5b8327.tar.gz
blackbird-hostboot-700cca7a165b5886876d792f2f87dc2c3a5b8327.zip
fix issues with errl in regards to fsp and plugins.
- add ERRL_CID_HOSTBOOT parameter to errl SrcPlugin and DataPlugin functions to handle modules being in multiple components; - add hbotcompid.H file to fsp.tar so that errl parser has hostboot's id-to-name mapping; Change-Id: Ied332ed0890721116b4e5cf1220f52ff8243dc3b RTC: 78942 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5598 Tested-by: Jenkins Server Reviewed-by: Richard J. Knight <rjknight@us.ibm.com> Reviewed-by: Thi N. Tran <thi@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
-rw-r--r--src/build/mkrules/dist.targets.mk1
-rwxr-xr-xsrc/usr/errl/parser/genErrlParsers.pl2
-rwxr-xr-xsrc/usr/errl/plugins/errludparser.H2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index fc42f8ad7..6762fd385 100644
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -190,6 +190,7 @@ fsp.tar_CONTENTS = \
src/build/tools/hwp_id.pl \
obj/genfiles/plugins/makefile:plugins/ \
obj/genfiles/plugins/hbfwUdIds.H:plugins/ \
+ src/include/usr/hbotcompid.H \
src/include/usr/hwas/common/hwasCallout.H:hwas/ \
src/include/usr/devicefw/driverif.H:devicefw/ \
src/include/usr/devicefw/userif.H:devicefw/ \
diff --git a/src/usr/errl/parser/genErrlParsers.pl b/src/usr/errl/parser/genErrlParsers.pl
index bd36799dd..da7fa1263 100755
--- a/src/usr/errl/parser/genErrlParsers.pl
+++ b/src/usr/errl/parser/genErrlParsers.pl
@@ -669,7 +669,7 @@ foreach my $compValue (keys %compValueToParseHash)
print OFILE " return l_success;\n";
print OFILE "}\n\n";
print OFILE "static errl::SrcPlugin g_SrcPlugin(0x$compValue";
- print OFILE "00, SrcDataParse);\n";
+ print OFILE "00, SrcDataParse, ERRL_CID_HOSTBOOT);\n";
close(OFILE);
}
diff --git a/src/usr/errl/plugins/errludparser.H b/src/usr/errl/plugins/errludparser.H
index c3b1f95a8..39e28929b 100755
--- a/src/usr/errl/plugins/errludparser.H
+++ b/src/usr/errl/plugins/errludparser.H
@@ -83,7 +83,7 @@ static bool myDataParse(\
}\
return l_rc;\
}\
-static errl::DataPlugin g_DataPlugin(COMPID, myDataParse);
+static errl::DataPlugin g_DataPlugin(COMPID, myDataParse, ERRL_CID_HOSTBOOT);
#endif
OpenPOWER on IntegriCloud