diff options
author | Dan Crowell <dcrowell@us.ibm.com> | 2013-03-11 09:06:57 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-03-12 12:32:41 -0500 |
commit | 252863ed1979ecf96fa5cdc2b13e3a37a0657c77 (patch) | |
tree | ae751e5a5a2079702bfbfe6c54a03f2fe5209c60 /src/usr/runtime | |
parent | 7f1633f215d45102147218390d3b96a167ad2921 (diff) | |
download | talos-hostboot-252863ed1979ecf96fa5cdc2b13e3a37a0657c77.tar.gz talos-hostboot-252863ed1979ecf96fa5cdc2b13e3a37a0657c77.zip |
Skip all HDAT stuff in AVP mode
Change-Id: Ic2940a7f70c8d6f4a6e4afd6ddfeb607a71fe749
RTC: 65948
CQ: SW191055
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/3507
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/runtime')
-rw-r--r-- | src/usr/runtime/hdatservice.C | 2 | ||||
-rw-r--r-- | src/usr/runtime/populate_attributes.C | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/usr/runtime/hdatservice.C b/src/usr/runtime/hdatservice.C index 733063281..a6eceed51 100644 --- a/src/usr/runtime/hdatservice.C +++ b/src/usr/runtime/hdatservice.C @@ -318,7 +318,7 @@ errlHndl_t RUNTIME::load_host_data( void ) // if any AVP flags are set, override the payload kind if( (mnfg_flags & TARGETING::MNFG_FLAG_BIT_MNFG_AVP_ENABLE) - || (mnfg_flags & TARGETING::MNFG_FLAG_BIT_MNFG_AVP_ENABLE) ) + || (mnfg_flags & TARGETING::MNFG_FLAG_BIT_MNFG_HDAT_AVP_ENABLE) ) { if( payload_kind != TARGETING::PAYLOAD_KIND_AVP ) { diff --git a/src/usr/runtime/populate_attributes.C b/src/usr/runtime/populate_attributes.C index 30514ca6b..650f0d927 100644 --- a/src/usr/runtime/populate_attributes.C +++ b/src/usr/runtime/populate_attributes.C @@ -520,13 +520,7 @@ errlHndl_t populate_attributes( void ) do { TRACFCOMP( g_trac_runtime, "Running populate_attributes" ); - // Map the Host Data into the VMM - errhdl = RUNTIME::load_host_data(); - if( errhdl ) - { - break; - } - + // Write the System-level Attributes errhdl = populate_system_attributes(); if( errhdl ) { |