From 41d22225ff918f5e43e38a8bd50336d63d7362b4 Mon Sep 17 00:00:00 2001 From: Christian Geddes Date: Fri, 26 Apr 2019 09:52:00 -0500 Subject: Remove workaround filtering invalid filenames When Axone HWPs first started coming in from the memory team they were naming some of the files the same name as what they did for the nimbus version of these files. This caused issues when we tried to compile because there were naming collisions. These file names have changed to have the model prepended to the filename Change-Id: I9868e39cb70c34f9eb3fbd7244b7c2065620f3eb RTC: 207832 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76568 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Glenn Miles Reviewed-by: Matt Derksen Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- src/usr/isteps/mss/makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/usr/isteps/mss/makefile') diff --git a/src/usr/isteps/mss/makefile b/src/usr/isteps/mss/makefile index 40eec68d9..6a97664c9 100644 --- a/src/usr/isteps/mss/makefile +++ b/src/usr/isteps/mss/makefile @@ -198,10 +198,6 @@ MSS_MODULE_OBJS += $(if $(CONFIG_AXONE),$(patsubst %.C,%.o,$(MSS_AXONE_SOURCE)), MSS_PATH_EXPLORER := $(EXPLORER_PROCEDURES_PATH)/hwp/memory/lib MSS_EXPLORER_SOURCE := $(shell find $(MSS_PATH_EXPLORER) -name '*.C' -exec basename {} \;) -# TODO RTC: 207832 Remove filter-out commands when new lib files come -MSS_EXPLORER_SOURCE := $(filter-out memdiags.C,$(MSS_EXPLORER_SOURCE)) -MSS_EXPLORER_SOURCE := $(filter-out mcbist.C,$(MSS_EXPLORER_SOURCE)) -MSS_EXPLORER_SOURCE := $(filter-out memory_size.C,$(MSS_EXPLORER_SOURCE)) #must bring explorer_memory_size.o in even in Nimbus/Cumulus builds because of p9_mss_grouping nest HWP MSS_MODULE_OBJS += $(if $(CONFIG_AXONE),$(patsubst %.C,%.o,$(MSS_EXPLORER_SOURCE)),explorer_memory_size.o) MODULE = isteps_mss -- cgit v1.2.1