From c4b67afb3574c4750bc8e7ebf3b9c7357ab6b1a4 Mon Sep 17 00:00:00 2001 From: Christian Geddes Date: Tue, 9 Apr 2019 13:32:34 -0500 Subject: Correct MSS accessor generation for Axone compiles There is still some changes coming through for the p9a_mss_freq HWP. When we tried to pull these changes in it exposed some problems we had in how we were generating the accessor functions that the mss hwps rely on. We were missing some XMLs and when we pulled them in it caused collisions with a mirror of the accessor header we pulled in by accident. This commit resolves the accessor issues. Change-Id: Ia134ffba6e82eb93f9c0762dcd851866d4475de8 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75779 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW Reviewed-by: Matt Derksen Reviewed-by: Michael Baiocchi Reviewed-by: Daniel M. Crowell --- src/usr/isteps/mss/makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/usr/isteps/mss/makefile') diff --git a/src/usr/isteps/mss/makefile b/src/usr/isteps/mss/makefile index 7aa6f052f..d22f1ddc7 100644 --- a/src/usr/isteps/mss/makefile +++ b/src/usr/isteps/mss/makefile @@ -39,6 +39,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ EXTRAINCDIR += ${IMPORT_PATH}/chips/ocmb/explorer/common/include/ EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/chips/ocmb/explorer/procedures/hwp/memory/lib/ EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/generic/memory/lib/ +EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/ MSS_LIB += ${PROCEDURES_PATH}/hwp/memory MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib @@ -100,6 +101,8 @@ OUTPATH = ${ROOTPATH}/obj/genfiles/generic/memory/lib/ FILE_PREFIX = mss_generic_system SOURCES += $(IMPORT_PATH)/hwpf/fapi2/xml/attribute_info/system_attributes.xml +SOURCES += $(IMPORT_PATH)/generic/procedures/xml/attribute_info/generic_memory_mrw_attributes.xml +SOURCES += $(IMPORT_PATH)/chips/p9/procedures/xml/attribute_info/freq_attributes.xml CLEAN_TARGETS += ${OUTPATH}/mss_generic_system_attribute_getters.H CLEAN_TARGETS += ${OUTPATH}/.generic_system_accessors.built @@ -119,7 +122,10 @@ $(GENERATED)_COMMAND_PATH = $(IMPORT_PATH)/generic/memory/tools/ OUTPATH = ${ROOTPATH}/obj/genfiles/generic/memory/lib FILE_PREFIX = mss_generic -SOURCES += $(shell find $(IMPORT_PATH)/generic/procedures/xml/attribute_info/ -type f) +SOURCES += $(IMPORT_PATH)/generic/procedures/xml/attribute_info/generic_memory_attributes.xml +SOURCES += $(IMPORT_PATH)/generic/procedures/xml/attribute_info/generic_dq_attributes.xml +SOURCES += $(IMPORT_PATH)/generic/procedures/xml/attribute_info/generic_memory_eff_attributes.xml +SOURCES += $(IMPORT_PATH)/generic/procedures/xml/attribute_info/generic_memory_si_attributes.xml CLEAN_TARGETS += ${OUTPATH}/mss_generic_attribute_getters.H CLEAN_TARGETS += ${OUTPATH}/mss_generic_attribute_setters.H -- cgit v1.2.1