diff options
| -rw-r--r-- | src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk | 12 | ||||
| -rwxr-xr-x | src/usr/diag/prdf/makefile | 69 | ||||
| -rw-r--r-- | src/usr/diag/prdf/prdf_common_hb_only.mk | 48 |
3 files changed, 62 insertions, 67 deletions
diff --git a/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk b/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk index e068e15a2..ac9aa59f6 100644 --- a/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk +++ b/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk @@ -42,6 +42,18 @@ prd_vpath += ${PRD_SRC_PATH}/common/plat/pegasus prd_vpath += ${PRD_SRC_PATH}/common/plugins prd_vpath += ${PRD_SRC_PATH}/common/util +prd_incpath += ${PRD_SRC_PATH}/common +prd_incpath += ${PRD_SRC_PATH}/common/framework/config +prd_incpath += ${PRD_SRC_PATH}/common/framework/register +prd_incpath += ${PRD_SRC_PATH}/common/framework/resolution +prd_incpath += ${PRD_SRC_PATH}/common/framework/rule +prd_incpath += ${PRD_SRC_PATH}/common/framework/service +prd_incpath += ${PRD_SRC_PATH}/common/mnfgtools +prd_incpath += ${PRD_SRC_PATH}/common/plat +prd_incpath += ${PRD_SRC_PATH}/common/plat/pegasus +prd_incpath += ${PRD_SRC_PATH}/common/plugins +prd_incpath += ${PRD_SRC_PATH}/common/util + ################################################################################ # Object files common to both FSP and Hostboot ################################################################################ diff --git a/src/usr/diag/prdf/makefile b/src/usr/diag/prdf/makefile index 57f4e00c5..41c91e1b0 100755 --- a/src/usr/diag/prdf/makefile +++ b/src/usr/diag/prdf/makefile @@ -39,77 +39,12 @@ include common/prdf_common_fsp_and_hb.mk VPATH += ${prd_vpath} -#------------------------------------------------------------------------------ -# paths -#------------------------------------------------------------------------------ -PRD_USR_PATH = ${ROOTPATH}/src/usr/diag/prdf - -#FIXME: we can remove most of these as well if we have them include correctly -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/util -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/errl -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ibscom -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer -EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/bus_training -EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete -EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include - -#FIXME: once we fix the PRD includes, we can move most of the prd subdirs below -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag/prdf -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag/prdf/common -EXTRAINCDIR += ${PRD_USR_PATH} -EXTRAINCDIR += ${PRD_USR_PATH}/common -EXTRAINCDIR += ${PRD_USR_PATH}/common/plugins -EXTRAINCDIR += ${PRD_USR_PATH}/common/util -EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/service -EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/register -EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/resolution -EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/config -EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/rule -EXTRAINCDIR += ${PRD_USR_PATH}/common/plat -EXTRAINCDIR += ${PRD_USR_PATH}/common/plat/pegasus -EXTRAINCDIR += ${PRD_USR_PATH}/common/mnfgtools -EXTRAINCDIR += ${PRD_USR_PATH}/mnfgtools -EXTRAINCDIR += ${PRD_USR_PATH}/framework/service -EXTRAINCDIR += ${PRD_USR_PATH}/framework/config -EXTRAINCDIR += ${PRD_USR_PATH}/framework/resolution -EXTRAINCDIR += ${PRD_USR_PATH}/plat/pegasus - -# Conditionally enables profiling of flyweight register and resolution object -ifeq ($(PRD_PROFILER),1) -CUSTOMFLAGS += -DFLYWEIGHT_PROFILING -endif - -#------------------------------------------------------------------------------ -# objects -#------------------------------------------------------------------------------ +EXTRAINCDIR += ${prd_incpath} OBJS += ${prd_obj} OBJS += ${prd_obj_no_sim} OBJS += ${prd_rule_plugin} -#------------------------------------------------------------------------------ -# Generated Mfg Threshold Header file -#------------------------------------------------------------------------------ - -GENDIR = ${ROOTPATH}/obj/genfiles - -MFG_THRES = prdfMfgThresholds -MFG_THRES_H = ${MFG_THRES}.H -MFG_THRES_PL = ${PRD_USR_PATH}/common/mnfgtools/${MFG_THRES}.pl -MFG_THRES_LIST = ${PRD_USR_PATH}/common/mnfgtools/${MFG_THRES}.lst -RULEOBJDIR = ${ROOTPATH}/obj/modules/prdf/rule -MFG_THRES_PATH = ${GENDIR}/${MFG_THRES_H} - -GENFILES = ${MFG_THRES_H} - -${MFG_THRES_PATH} : ${MFG_THRES_LIST} - ${MFG_THRES_PL} $^ > $@ - -EXTRA_CLEAN = ${MFG_THRES_PATH} - -#------------------------------------------------------------------------------ +################################################################################ include ${ROOTPATH}/config.mk diff --git a/src/usr/diag/prdf/prdf_common_hb_only.mk b/src/usr/diag/prdf/prdf_common_hb_only.mk index 65a0b992f..3f9630703 100644 --- a/src/usr/diag/prdf/prdf_common_hb_only.mk +++ b/src/usr/diag/prdf/prdf_common_hb_only.mk @@ -41,6 +41,28 @@ prd_vpath += ${PRD_SRC_PATH}/mnfgtools prd_vpath += ${PRD_SRC_PATH}/plat prd_vpath += ${PRD_SRC_PATH}/plat/pegasus +# Internal PRD header paths +prd_incpath += ${PRD_INC_PATH} # Stored differently in FSP +prd_incpath += ${PRD_INC_PATH}/common # Stored differently in FSP +prd_incpath += ${PRD_SRC_PATH} +prd_incpath += ${PRD_SRC_PATH}/framework/config +prd_incpath += ${PRD_SRC_PATH}/framework/resolution +prd_incpath += ${PRD_SRC_PATH}/framework/service +prd_incpath += ${PRD_SRC_PATH}/mnfgtools +prd_incpath += ${PRD_SRC_PATH}/plat/pegasus + +# External header paths +prd_incpath += ${ROOTPATH}/src/include/usr/ecmddatabuffer +prd_incpath += ${ROOTPATH}/src/include/usr/errl +prd_incpath += ${ROOTPATH}/src/include/usr/hwpf/fapi +prd_incpath += ${ROOTPATH}/src/include/usr/hwpf/hwp +prd_incpath += ${ROOTPATH}/src/include/usr/hwpf/plat +prd_incpath += ${ROOTPATH}/src/include/usr/ibscom +prd_incpath += ${ROOTPATH}/src/include/usr/util +prd_incpath += ${ROOTPATH}/src/usr/hwpf/hwp/bus_training +prd_incpath += ${ROOTPATH}/src/usr/hwpf/hwp/include +prd_incpath += ${ROOTPATH}/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete + ################################################################################ # Hostboot only object files common to both IPL and runtime ################################################################################ @@ -77,3 +99,29 @@ prd_rule_plugin += prdfPlatCenPll.o prd_rule_plugin += prdfPlatP8Ex.o prd_rule_plugin += prdfPlatP8Proc.o +################################################################################ +# Conditional compile flag to enable profiling of flyweight register and +# resolution object +################################################################################ + +ifeq ($(PRD_PROFILER),1) +CUSTOMFLAGS += -DFLYWEIGHT_PROFILING +endif + +################################################################################ +# Rule for generated MNFG threshold header file +################################################################################ + +MFG_THRES = prdfMfgThresholds +MFG_THRES_H = ${MFG_THRES}.H +MFG_THRES_PL = ${PRD_SRC_PATH}/common/mnfgtools/${MFG_THRES}.pl +MFG_THRES_LIST = ${PRD_SRC_PATH}/common/mnfgtools/${MFG_THRES}.lst +MFG_THRES_PATH = ${ROOTPATH}/obj/genfiles/${MFG_THRES_H} + +GENFILES += ${MFG_THRES_H} + +${MFG_THRES_PATH} : ${MFG_THRES_LIST} + ${MFG_THRES_PL} $^ > $@ + +EXTRA_CLEAN += ${MFG_THRES_PATH} + |
