diff options
Diffstat (limited to 'src/usr')
-rw-r--r--[-rwxr-xr-x] | src/usr/diag/prdf/common/framework/rule/prdf_rule.mk (renamed from src/usr/diag/prdf/common/prd_ruletable.mk) | 29 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/framework/rule/tables.mk | 6 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk | 7 | ||||
-rwxr-xr-x | src/usr/diag/prdf/framework/rule/makefile | 23 | ||||
-rwxr-xr-x | src/usr/diag/prdf/makefile | 2 |
5 files changed, 34 insertions, 33 deletions
diff --git a/src/usr/diag/prdf/common/prd_ruletable.mk b/src/usr/diag/prdf/common/framework/rule/prdf_rule.mk index 1ebdd8d52..1f58070ea 100755..100644 --- a/src/usr/diag/prdf/common/prd_ruletable.mk +++ b/src/usr/diag/prdf/common/framework/rule/prdf_rule.mk @@ -1,11 +1,13 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/prd_ruletable.mk $ +# $Source: src/usr/diag/prdf/common/framework/rule/prdf_rule.mk $ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2005,2014 +# Contributors Listed Below - COPYRIGHT 2014 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,19 +23,14 @@ # # IBM_PROLOG_END_TAG -PRDR_RULE_TABLE_FILES += Proc.rule -PRDR_RULE_TABLE_FILES += Ex.rule -PRDR_RULE_TABLE_FILES += Mcs.rule -PRDR_RULE_TABLE_FILES += Membuf.rule -PRDR_RULE_TABLE_FILES += Mba.rule - -PRDR_RULE_TABLE_TARGETS = ${PRDR_RULE_TABLE_FILES:.rule=.prf} +prd_rule_files += Proc.rule +prd_rule_files += Ex.rule +prd_rule_files += Mcs.rule +prd_rule_files += Membuf.rule +prd_rule_files += Mba.rule -prd_ruletable += prdrLoadChip.o -prd_ruletable += prdrLoadChipCache.o -prd_ruletable += prdfRuleMetaData.o -prd_ruletable += prdfRuleChip.o -prd_ruletable += prdfGroup.o -prd_ruletable += prdfPluginMap.o -prd_ruletable += prdfRuleFiles.o +prd_rule_prf_targets = ${prd_rule_files:.rule=.prf} +prd_rule_err_targets = ${prd_rule_files:.rule=.prf.err.C} +prd_rule_reg_targets = ${prd_rule_files:.rule=.prf.reg.C} +prd_rule_html_targets = ${prd_rule_files:.rule=.prf.html} diff --git a/src/usr/diag/prdf/common/framework/rule/tables.mk b/src/usr/diag/prdf/common/framework/rule/tables.mk index bcc26b395..65405e5e4 100755 --- a/src/usr/diag/prdf/common/framework/rule/tables.mk +++ b/src/usr/diag/prdf/common/framework/rule/tables.mk @@ -5,7 +5,9 @@ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2005,2014 +# Contributors Listed Below - COPYRIGHT 2012,2014 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -27,7 +29,7 @@ #------------------------------------------------------------------- # Add Rule tables here: -# FIXME: This is now a duplicate of PRDR_RULE_TABLE_TARGETS in prd_ruletable.mk +# FIXME: This is now a duplicate of prd_rule_prf_targets in prdf_rule.mk PRDR_RULE_TABLES += Proc.prf PRDR_RULE_TABLES += Ex.prf PRDR_RULE_TABLES += Mcs.prf 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 e4d83e0dc..fe227d668 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 @@ -67,6 +67,13 @@ prd_obj += xspprdGardResolution.o # common/framework/rule/ prd_obj += iipTemplates.o +prd_obj += prdfGroup.o +prd_obj += prdfPluginMap.o +prd_obj += prdfRuleChip.o +prd_obj += prdfRuleFiles.o +prd_obj += prdfRuleMetaData.o +prd_obj += prdrLoadChip.o +prd_obj += prdrLoadChipCache.o # common/framework/service/ prd_obj_no_sim += prdfPlatServices_common.o diff --git a/src/usr/diag/prdf/framework/rule/makefile b/src/usr/diag/prdf/framework/rule/makefile index 628ff19ca..39b3e5a09 100755 --- a/src/usr/diag/prdf/framework/rule/makefile +++ b/src/usr/diag/prdf/framework/rule/makefile @@ -42,6 +42,8 @@ OBJ_RULE_LINK_DIR = ${OBJ_PLUG_LINK_PATH}/${OBJ_RULE} VPATH = ${SRC_USR_DIR}/common/framework/rule +include ../../common/framework/rule/prdf_rule.mk + #------------------------------------------------------------------------------ # Generated files #------------------------------------------------------------------------------ @@ -69,15 +71,9 @@ PRDR_CMP_YACC_H_PATH = ${OBJ_RULE_DIR}/${PRDR_CMP_YACC_H} PRDR_CMP_FLEX_o_PATH = ${OBJ_RULE_DIR}/${PRDR_CMP_FLEX_o} PRDR_CMP_FLEX_C_PATH = ${OBJ_RULE_DIR}/${PRDR_CMP_FLEX_C} -include ../../common/prd_ruletable.mk # for PRDR_RULE_TABLE_TARGETS - -ERR_PLUGIN_TARGETS = ${PRDR_RULE_TABLE_FILES:.rule=.prf.err.C} -REG_PLUGIN_TARGETS = ${PRDR_RULE_TABLE_FILES:.rule=.prf.reg.C} -HTML_PLUGIN_TARGETS = ${PRDR_RULE_TABLE_FILES:.rule=.prf.html} - -PRF_IMG_PATHS = $(addprefix ${IMGDIR}/, ${PRDR_RULE_TABLE_TARGETS}) -ERR_PLUGIN_PATHS = $(addprefix ${OBJ_PLUG_DIR}/, ${ERR_PLUGIN_TARGETS}) -REG_PLUGIN_PATHS = $(addprefix ${OBJ_PLUG_DIR}/, ${REG_PLUGIN_TARGETS}) +PRF_IMG_PATHS = $(addprefix ${IMGDIR}/, ${prd_rule_prf_targets}) +ERR_PLUGIN_PATHS = $(addprefix ${OBJ_PLUG_DIR}/, ${prd_rule_err_targets}) +REG_PLUGIN_PATHS = $(addprefix ${OBJ_PLUG_DIR}/, ${prd_rule_reg_targets}) #------------------------------------------------------------------------------- # Files linked to the error log plugins directory @@ -88,6 +84,7 @@ SOURCE_PLUGIN_DIRS += ${SRC_USR}/common/plugins SOURCE_PLUGIN_DIRS += ${SRC_USR}/plugins # Individual source files to link. +SOURCE_PLUGIN_FILES += ${SRC_USR}/common/framework/rule/prdf_rule.mk SOURCE_PLUGIN_FILES += ${SRC_USR}/common/framework/rule/tables.mk SOURCE_PLUGIN_FILES += ${SRC_USR}/common/util/UtilHash.H SOURCE_PLUGIN_FILES += ${SRC_USR}/common/plat/pegasus/prdfCenConst.H @@ -114,10 +111,10 @@ CLEAN_TARGETS += ${PRDR_CMP_YACC_C_PATH} CLEAN_TARGETS += ${PRDR_CMP_YACC_H_PATH} CLEAN_TARGETS += ${PRDR_CMP_FLEX_o_PATH} CLEAN_TARGETS += ${PRDR_CMP_FLEX_C_PATH} -CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${PRDR_RULE_TABLE_TARGETS}) -CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${ERR_PLUGIN_TARGETS}) -CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${REG_PLUGIN_TARGETS}) -CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${HTML_PLUGIN_TARGETS}) +CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${prd_rule_prf_targets}) +CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${prd_rule_err_targets}) +CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${prd_rule_reg_targets}) +CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${prd_rule_html_targets}) CLEAN_TARGETS += ${PRF_IMG_PATHS} CLEAN_TARGETS += ${ERR_PLUGIN_PATHS} CLEAN_TARGETS += ${REG_PLUGIN_PATHS} diff --git a/src/usr/diag/prdf/makefile b/src/usr/diag/prdf/makefile index c56ee252d..21577fe1c 100755 --- a/src/usr/diag/prdf/makefile +++ b/src/usr/diag/prdf/makefile @@ -98,10 +98,8 @@ endif # objects #------------------------------------------------------------------------------ -include common/prd_ruletable.mk include prdf_hb_only.mk -OBJS += ${prd_ruletable} OBJS += ${prd_object_files_HB} OBJS += ${PRDF_RULE_PLUGINS_PEGASUS_HB} |