diff options
| author | Caleb Palmer <cnpalmer@us.ibm.com> | 2019-02-20 12:07:57 -0600 |
|---|---|---|
| committer | Zane C. Shelley <zshelle@us.ibm.com> | 2019-02-22 13:27:17 -0600 |
| commit | 670a4d60cf403e9586470f7634e826e735422644 (patch) | |
| tree | 07787c8b4ffce84011de842688b4f6d2bd6e971a /src/usr/diag | |
| parent | 26ccad36beb17c9e23a920913cdae8c41a70eeec (diff) | |
| download | talos-hostboot-670a4d60cf403e9586470f7634e826e735422644.tar.gz talos-hostboot-670a4d60cf403e9586470f7634e826e735422644.zip | |
PRD: Explorer rule and makefile updates
Change-Id: Id35a1f07a025566bcf082d5fcc0f773c4477257e
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72199
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72279
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Diffstat (limited to 'src/usr/diag')
5 files changed, 10 insertions, 2 deletions
diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H index fc9a89a1d..7bedec637 100644 --- a/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H +++ b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2018 */ +/* Contributors Listed Below - COPYRIGHT 2012,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -195,6 +195,7 @@ PRDF_TARGET_TYPE_ALIAS( TYPE_MI, TARGETING::TYPE_MI ) PRDF_TARGET_TYPE_ALIAS( TYPE_DMI, TARGETING::TYPE_DMI ) PRDF_TARGET_TYPE_ALIAS( TYPE_MCC, TARGETING::TYPE_MCC ) PRDF_TARGET_TYPE_ALIAS( TYPE_OMIC, TARGETING::TYPE_OMIC ) +PRDF_TARGET_TYPE_ALIAS( TYPE_OCMB_CHIP, TARGETING::TYPE_OCMB_CHIP ) PRDF_TARGET_TYPE_ALIAS( TYPE_MEMBUF, TARGETING::TYPE_MEMBUF ) PRDF_TARGET_TYPE_ALIAS( TYPE_L4, TARGETING::TYPE_L4 ) PRDF_TARGET_TYPE_ALIAS( TYPE_MBA, TARGETING::TYPE_MBA ) diff --git a/src/usr/diag/prdf/common/plat/explorer/explorer_ocmb.rule b/src/usr/diag/prdf/common/plat/explorer/explorer_ocmb.rule index 7fefa6a2c..1abd08c96 100644 --- a/src/usr/diag/prdf/common/plat/explorer/explorer_ocmb.rule +++ b/src/usr/diag/prdf/common/plat/explorer/explorer_ocmb.rule @@ -1463,5 +1463,6 @@ group gOMIDLFIR ############################################################################## # Include the actions defined for this target +.include "p9_common_actions.rule"; .include "explorer_ocmb_actions.rule"; diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C b/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C index cbf60758d..e37cffcd3 100755 --- a/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C +++ b/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C @@ -184,6 +184,7 @@ errlHndl_t PlatConfigurator::build() // Memory chip domains are always second. if ( nullptr != membufDomain ) sysDmnLst.push_back( membufDomain ); + if ( nullptr != ocmbChipDomain ) sysDmnLst.push_back( ocmbChipDomain ); // Processor chip domains are always third. sysDmnLst.push_back( procDomain ); diff --git a/src/usr/diag/prdf/common/rule/prdf_rule.mk b/src/usr/diag/prdf/common/rule/prdf_rule.mk index f4f46e18b..5bc26c102 100644 --- a/src/usr/diag/prdf/common/rule/prdf_rule.mk +++ b/src/usr/diag/prdf/common/rule/prdf_rule.mk @@ -71,6 +71,9 @@ PRDR_RULE_TABLES += axone_omic.prf PRDR_RULE_TABLES += centaur_membuf.prf PRDR_RULE_TABLES += centaur_mba.prf +# Explorer Chip +PRDR_RULE_TABLES += explorer_ocmb.prf + prd_rule_prf_targets = ${PRDR_RULE_TABLES} prd_rule_err_targets = ${PRDR_RULE_TABLES:.prf=.prf.err.C} prd_rule_disp_targets = ${PRDR_RULE_TABLES:.prf=.prf.disp.C} diff --git a/src/usr/diag/prdf/rule/makefile b/src/usr/diag/prdf/rule/makefile index dccd386af..7efcacde3 100755 --- a/src/usr/diag/prdf/rule/makefile +++ b/src/usr/diag/prdf/rule/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016,2018 +# Contributors Listed Below - COPYRIGHT 2016,2019 # [+] International Business Machines Corp. # # @@ -207,6 +207,7 @@ ${PRDR_CMP_PATH}: ${PRDR_CMP_YACC_o_PATH} ${PRDR_CMP_FLEX_o_PATH} \ vpath %.rule \ ../common/plat/p9 \ ../common/plat/axone \ + ../common/plat/explorer \ ../common/plat/centaur \ ../common/plat/cumulus \ ../common/plat/mem \ @@ -214,6 +215,7 @@ vpath %.rule \ PRDRPP_SEARCHDIRS = -I../common/plat/p9 \ -I../common/plat/axone \ + -I../common/plat/explorer \ -I../common/plat/centaur \ -I../common/plat/cumulus \ -I../common/plat/mem \ |
