diff options
author | Christian Geddes <crgeddes@us.ibm.com> | 2019-04-04 16:32:22 -0500 |
---|---|---|
committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2019-04-06 18:14:32 -0500 |
commit | 616f55b76767d3ed2e8dec3f37a29aec46fdf331 (patch) | |
tree | 212eedf22e24a39bd64545fa1ce516581e71751a /src/usr/isteps/mss/makefile | |
parent | 54a9c7b4a9e85d7d49a38e3d5e3f2407241cde13 (diff) | |
download | talos-hostboot-616f55b76767d3ed2e8dec3f37a29aec46fdf331.tar.gz talos-hostboot-616f55b76767d3ed2e8dec3f37a29aec46fdf331.zip |
Setup CONFIG_AXONE env variable correctly
In previous attempt to use CONFIG_AXONE env variable as a flag to
decided whether or not to compile certain AXONE only features we
forgot to add in the config variable to HBconfig. Worse is we were
using the wrong env var in the make files as a flag. As a result,
without this change we are not running any Axone HWPs in axone
simics.
Change-Id: I82dd7f86c5ad390a23eab2d2123d1d10ca9edea3
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75568
Reviewed-by: Matthew Raybuck <matthew.raybuck@ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/usr/isteps/mss/makefile')
-rw-r--r-- | src/usr/isteps/mss/makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/usr/isteps/mss/makefile b/src/usr/isteps/mss/makefile index 122905c34..7aa6f052f 100644 --- a/src/usr/isteps/mss/makefile +++ b/src/usr/isteps/mss/makefile @@ -80,6 +80,8 @@ MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/power_thermal/ MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/omi/ MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/i2c/ MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/fir/ +MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/mcbist/ +MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/phy/ EXTRAINCDIR += ${MSS_LIB} @@ -183,10 +185,9 @@ MSS_PATH_GENERIC_MEMORY := ${ROOTPATH}/src/import/generic/memory/lib MSS_GENERIC_MEMORY_SOURCE := $(shell find $(MSS_PATH_GENERIC_MEMORY) -name '*.C' -exec basename {} \;) MSS_MODULE_OBJS += $(patsubst %.C,%.o,$(MSS_GENERIC_MEMORY_SOURCE)) -ifdef CONFIG_AXONE_BRINGUP MSS_PATH_AXONE := $(AXONE_PROCEDURES_PATH)/hwp/memory/lib MSS_AXONE_SOURCE := $(shell find $(MSS_PATH_AXONE) -name '*.C' -exec basename {} \;) -MSS_MODULE_OBJS += $(patsubst %.C,%.o,$(MSS_AXONE_SOURCE)) +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 {} \;) @@ -194,11 +195,8 @@ MSS_EXPLORER_SOURCE := $(shell find $(MSS_PATH_EXPLORER) -name '*.C' -exec basen 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)) -MSS_MODULE_OBJS += $(patsubst %.C,%.o,$(MSS_EXPLORER_SOURCE)) -else -#must bring this in even in Nimbus/Cumulus builds because of p9_mss_grouping nest HWP -MSS_MODULE_OBJS += explorer_memory_size.o -endif +#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 OBJS += $(MSS_MODULE_OBJS) $(call BUILD_MODULE) |