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>
open-power · Feb 22, 2019 · 670a4d6 · 670a4d6
1 parent 26ccad3
commit 670a4d6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2018
+# Contributors Listed Below - COPYRIGHT 2016,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -207,13 +207,15 @@ ${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 \
 	  ../common/plat/nimbus
 
 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 \