diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2014-02-21 13:46:28 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-02-24 10:15:10 -0600 |
| commit | 6def3b6e46ff50a787b07680f52250b3e9ef3ea4 (patch) | |
| tree | 792cb2462d2d1ccf35ae8ca644fdb3e2da712d0d /src/usr/hwpf/hwp/start_payload | |
| parent | 86817c8c9cece2024c595c9781aac69a3ddf9e57 (diff) | |
| download | talos-hostboot-6def3b6e46ff50a787b07680f52250b3e9ef3ea4.tar.gz talos-hostboot-6def3b6e46ff50a787b07680f52250b3e9ef3ea4.zip | |
Skip populate_attributes in AVP mode
Change-Id: Ied22691665a135558bea764a640ba0c2436d24d6
CQ: SW248382
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9071
Tested-by: Jenkins Server
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf/hwp/start_payload')
| -rw-r--r-- | src/usr/hwpf/hwp/start_payload/start_payload.C | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/usr/hwpf/hwp/start_payload/start_payload.C b/src/usr/hwpf/hwp/start_payload/start_payload.C index c89aa30bc..5ee237b88 100644 --- a/src/usr/hwpf/hwp/start_payload/start_payload.C +++ b/src/usr/hwpf/hwp/start_payload/start_payload.C @@ -232,14 +232,6 @@ void* call_host_runtime_setup( void *io_pArgs ) break; } - // Get the Payload kind -- various tasks rely on payload - TARGETING::Target * sys = NULL; - TARGETING::targetService().getTopLevelTarget( sys ); - assert(sys != NULL); - TARGETING::ATTR_PAYLOAD_KIND_type payload_kind - = sys->getAttr<TARGETING::ATTR_PAYLOAD_KIND>(); - - //Start OCC in AVP (or Sapphire mode for now) if( is_avp_load() || is_sapphire_load() ) { @@ -334,7 +326,7 @@ void* call_host_runtime_setup( void *io_pArgs ) } } - else if( TARGETING::PAYLOAD_KIND_PHYP == payload_kind ) + else if( is_phyp_load() ) { //If PHYP then clear out the PORE BARs l_err = clearPoreBars(); @@ -362,7 +354,7 @@ void* call_host_runtime_setup( void *io_pArgs ) break; } } - else if( TARGETING::PAYLOAD_KIND_NONE == payload_kind ) + else if( !is_avp_load() ) { // Write the HostServices attributes into mainstore // for our testcases |
