summaryrefslogtreecommitdiffstats
path: root/src/usr/isteps/istep06/makefile
diff options
context:
space:
mode:
authorChristian Geddes <crgeddes@us.ibm.com>2017-09-22 12:53:53 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-09-22 22:55:06 -0400
commit5d1b04e960ff0d2d234ff2f39dea250663ae3dcb (patch)
tree0138fc52ae93bbb73840ed928991c521009f85e2 /src/usr/isteps/istep06/makefile
parenta702bf170b58a8be92fb66bae6c9f0bff23a4cce (diff)
downloadtalos-hostboot-5d1b04e960ff0d2d234ff2f39dea250663ae3dcb.tar.gz
talos-hostboot-5d1b04e960ff0d2d234ff2f39dea250663ae3dcb.zip
Add .o files directly instead of using the EKB's .mk for setup_evid
The .mk file for p9_setup_evid was causing bad behavior on the hb side of things. To get around this we will add what .o's we need from the .mk file and no longer include the .mk file Change-Id: I322be916d7cd6b06c540a4362846b69f44d3afaf Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46634 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Daniel M. Crowell <dcrowell@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: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/isteps/istep06/makefile')
-rw-r--r--src/usr/isteps/istep06/makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/usr/isteps/istep06/makefile b/src/usr/isteps/istep06/makefile
index e18d1c2e5..17e4342bb 100644
--- a/src/usr/isteps/istep06/makefile
+++ b/src/usr/isteps/istep06/makefile
@@ -72,12 +72,17 @@ include $(NEST_HWP_PATH)/p9_revert_sbe_mcs_setup.mk
#TODO RTC: 164237
# Take another look at PM lib
include $(PM_HWP_PATH)/p9_pm_utils.mk
-include $(PM_HWP_PATH)/p9_setup_evid.mk
+
include $(PM_HWP_PATH)/p9_query_core_access_state.mk
include $(PM_HWP_PATH)/p9_query_cache_access_state.mk
include $(PM_HWP_PATH)/p9_quad_power_off.mk
include $(LIB_HWP_PATH)/p9_avsbus_lib.mk
+#add objects from p9_setup_evid.mk directly to avoid duplicates
+OBJS+=p9_avsbus_lib.o
+OBJS+=p9_pstate_parameter_block.o
+OBJS+=p9_setup_evid.o
+
OBJS+=p9_hcd_core_stopclocks.o
OBJS+=p9_hcd_cache_stopclocks.o
OpenPOWER on IntegriCloud