diff options
| author | Prachi Gupta <pragupta@us.ibm.com> | 2017-03-20 11:07:49 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-05-01 11:44:49 -0400 |
| commit | 142a25c1a3453d0cc5bac4a93a2765e60a281d2d (patch) | |
| tree | 2d19105bb0e21d7dceae6e5b9a6874acb643f6df /src/usr/initservice | |
| parent | ab73555da035ad1193d3490fcb7be86bdf91c43a (diff) | |
| download | talos-hostboot-142a25c1a3453d0cc5bac4a93a2765e60a281d2d.tar.gz talos-hostboot-142a25c1a3453d0cc5bac4a93a2765e60a281d2d.zip | |
move all non-volatile/openpower attributes from _hb to _openpower files
When pushing hb's attr/target type files to common-mrw-xml repo, we add
tags to represent which attributes are for openpower (bmc based system)
and which are for fsp based systems. All attributes in _hb files are
considered common for both platforms and do not have any tag. All
attributes in _openpower will get openpower tag and be only shown
to a system engineer if they are building a bmc based system.
Therefore, the source of the attribute file is important from now on.
Change-Id: I213348f4c4f372b0610b07ad3453f08f75d02224
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38161
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@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>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/initservice')
| -rw-r--r-- | src/usr/initservice/istepdispatcher/istepdispatcher.C | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C index 98e68ac20..3ce73e8c5 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.C +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C @@ -64,13 +64,15 @@ #include <console/consoleif.H> #include <isteps/hwpisteperror.H> #include <pnor/pnorif.H> +#ifdef CONFIG_BMC_IPMI #include <ipmi/ipmiwatchdog.H> //IPMI watchdog timer #include <ipmi/ipmipowerstate.H> //IPMI System ACPI Power State #include <ipmi/ipmichassiscontrol.H> -#include <config.h> #include <ipmi/ipmisensor.H> #include <ipmi/ipmiif.H> +#endif +#include <config.h> #include <initservice/bootconfigif.H> #include <trace/trace.H> #include <util/utilmbox_scratch.H> @@ -248,8 +250,11 @@ void IStepDispatcher::init(errlHndl_t &io_rtaskRetErrl) // Get tracelite setting from top level target attributes TARGETING::Target* l_pSys = NULL; TARGETING::targetService().getTopLevelTarget(l_pSys); + +#ifdef CONFIG_INCLUDE_XML_OPENPOWER uint8_t l_tlEnabled = l_pSys->getAttr<TARGETING::ATTR_OP_TRACE_LITE>(); TRACE::setTraceLite(l_tlEnabled); +#endif if(iv_mailboxEnabled) { |
