From bf3f4096b25c185704d5dec4c15711e8139eb966 Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Wed, 7 Jun 2017 19:26:31 -0500 Subject: [PATCH] Remove workaround for attribute override in old HDAT Removing the use of the workaround that was in place to support attribute overrides with the non-RHB (legacy) version of HDAT. Change-Id: Iae0a8f124d56db9bf3172b1d4866e865cfd763d7 CQ: SW391403 RTC: 169478 CMVC-Coreq: 1024559 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41517 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Reviewed-by: Corey V. Swenson Reviewed-by: Martin Gloff Tested-by: Daniel M. Crowell Tested-by: FSP CI Jenkins Reviewed-by: William G. Hoffa --- src/usr/targeting/runtime/attrPlatOverride_rt.C | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/usr/targeting/runtime/attrPlatOverride_rt.C b/src/usr/targeting/runtime/attrPlatOverride_rt.C index c348b52e82a..3c5ebb8aee3 100644 --- a/src/usr/targeting/runtime/attrPlatOverride_rt.C +++ b/src/usr/targeting/runtime/attrPlatOverride_rt.C @@ -142,20 +142,6 @@ void applyTempOverrides() TRACFCOMP(g_trac_targeting, "Overrides found at %.16X", l_overAddr ); l_overPtr = reinterpret_cast(l_overAddr); } - else - { - //@fixme-RTC:169478-Remove this workaround once HDAT+PHYP is ready - // grab the data we stashed at the end of the targeting data - l_overAddr = g_hostInterfaces - ->get_reserved_mem("ibm,hbrt-target-image",0); - if( l_overAddr != 0 ) - { - l_overAddr += (1*MEGABYTE - 64*KILOBYTE); - TRACFCOMP(g_trac_targeting, "NULL from get_reserved_mem, using stashed value at %.llX instead", l_overAddr ); - l_overPtr = reinterpret_cast(l_overAddr); - l_usingStash = true; - } - } } // Having no overrides is a normal thing