diff options
| author | Venkatesh Sainath <vsainath@in.ibm.com> | 2018-06-06 09:53:43 -0500 | 
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-11-15 10:52:51 -0600 | 
| commit | 73cad1f1ae2a9f7b4876f61c5db85c35bbd08db3 (patch) | |
| tree | 4f198743adf5a35cb176c10b0ae5950aad7db94b /src/usr/diag | |
| parent | 208f80eb821cc1226bbcd76b0ba108754c2a091e (diff) | |
| download | blackbird-hostboot-73cad1f1ae2a9f7b4876f61c5db85c35bbd08db3.tar.gz blackbird-hostboot-73cad1f1ae2a9f7b4876f61c5db85c35bbd08db3.zip | |
Pushing HB plugins and related files for building errltool
Change-Id: I91d432a901fb4ee6de469ca8076637eaa2e1315d
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/60027
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sampa Misra <sampmisr@in.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/diag')
| -rwxr-xr-x | src/usr/diag/prdf/common/iipconst.h | 7 | ||||
| -rw-r--r-- | src/usr/diag/prdf/common/plugins/prdfProcLogParse.C | 1 | ||||
| -rw-r--r-- | src/usr/diag/prdf/plugins/Makefile_errl | 60 | 
3 files changed, 68 insertions, 0 deletions
| diff --git a/src/usr/diag/prdf/common/iipconst.h b/src/usr/diag/prdf/common/iipconst.h index 7935a3958..cf0ff8247 100755 --- a/src/usr/diag/prdf/common/iipconst.h +++ b/src/usr/diag/prdf/common/iipconst.h @@ -35,7 +35,10 @@  /*  Includes                                                          */  /*--------------------------------------------------------------------*/  #include <prdf_types.h> + +#ifndef LOGPARSER  #include <targeting/common/attributes.H> +#endif  /*--------------------------------------------------------------------*/  /*  User Types                                                        */ @@ -49,7 +52,11 @@  namespace PRDF  { +#ifndef LOGPARSER      typedef TARGETING::ATTR_HUID_type HUID; +#else +    typedef uint32_t HUID; +#endif      // FIXME: RTC: 62867 will resolve this      enum { INVALID_HUID = 0 }; diff --git a/src/usr/diag/prdf/common/plugins/prdfProcLogParse.C b/src/usr/diag/prdf/common/plugins/prdfProcLogParse.C index ae7287d76..9ae13ca54 100644 --- a/src/usr/diag/prdf/common/plugins/prdfProcLogParse.C +++ b/src/usr/diag/prdf/common/plugins/prdfProcLogParse.C @@ -39,6 +39,7 @@  #include <p9_quad_scom_addresses.H>  #include <p9_ppe_defs.H>  #include <map> +#include <vector>  #include <string>  namespace PRDF diff --git a/src/usr/diag/prdf/plugins/Makefile_errl b/src/usr/diag/prdf/plugins/Makefile_errl new file mode 100644 index 000000000..9cffd2508 --- /dev/null +++ b/src/usr/diag/prdf/plugins/Makefile_errl @@ -0,0 +1,60 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/usr/diag/prdf/plugins/Makefile $ +# +# OpenPOWER HostBoot Project +# +# Contributors Listed Below - COPYRIGHT 2018 +# [+] 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 +# +# + +include ../../../rules.mk + +CMDS = libhbprdfplugins.a + +LDFLAGS += -static + +CXXFLAGS += -DPRDF_HOSTBOOT_ERRL_PLUGIN -D__HOSTBOOT_MODULE -DLOGPARSER -DPRDPARSER -I. -I../.. -I../../targeting -I../../../include -I../../../include/util -I../../../include/extras -I../../../include/genfiles + +PRDF_PLUGIN_OBJS = prdfBitString.o        prdrErrlPluginsSupt.o p9_capp.prf.err.o \ +                   p9_eq.prf.err.o   p9_mca.prf.err.o      p9_mcs.prf.err.o \ +                   p9_obus.prf.err.o   p9_phb.prf.err.o    prdfLogParse.o \ +                   p9_capp.prf.reg.o   p9_eq.prf.reg.o   p9_mca.prf.reg.o \ +                   p9_mcs.prf.reg.o      p9_obus.prf.reg.o   p9_phb.prf.reg.o \ +                   prdfLogParse_common.o prdfMemLogParse.o p9_ec.prf.err.o \ +                   p9_ex.prf.err.o   p9_mcbist.prf.err.o   p9_nimbus.prf.err.o \ +                   p9_pec.prf.err.o    p9_xbus.prf.err.o   prdfParserUtils.o \ +                   p9_ec.prf.reg.o     p9_ex.prf.reg.o   p9_mcbist.prf.reg.o \ +                   p9_nimbus.prf.reg.o   p9_pec.prf.reg.o    p9_xbus.prf.reg.o   prdfProcLogParse.o + + +all: $(CMDS) + +libhbprdfplugins.a: $(PRDF_PLUGIN_OBJS) +	@echo "LD $(WORK_DIR)/$@" +	ar rvs $@ $(PRDF_PLUGIN_OBJS) + +$(PRDF_PLUGIN_OBJS):%.o: %.C +	@echo "$(CC) $(CXXFLAGS) $(WORK_DIR)/$@" +	@$(CC) $(CXXFLAGS) -c $< + +clean: +	@echo "Cleaning up $(WORK_DIR) files..." +	@rm -rf $(CMDS) $(PRDF_PLUGIN_OBJS) | 

