summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorZane Shelley <zshelle@us.ibm.com>2018-04-23 16:21:18 -0500
committerZane C. Shelley <zshelle@us.ibm.com>2018-04-27 12:14:40 -0400
commit526bef08021c62233717c4aad8b48650f73c3180 (patch)
treeb3107a25ee4c6577e1ceffc38171d6ff52139ceb /src/usr
parentab3cba6aa16d2c55296d8f1debcd0f732f85c498 (diff)
downloadtalos-hostboot-526bef08021c62233717c4aad8b48650f73c3180.tar.gz
talos-hostboot-526bef08021c62233717c4aad8b48650f73c3180.zip
PRD: add files for Centaur rule plugins
Change-Id: I9c1ba69149ea9596ba93f9971d8a91469ff98845 RTC: 187481 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57694 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com> Reviewed-by: Matt Derksen <mderkse1@us.ibm.com> Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Squashed: I665d708dbaa460001c2af53ec693b8b2afc1eaf2 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57882 CI-Ready: Zane C. Shelley <zshelle@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>
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/diag/prdf/common/plat/cen/prdfCenMembuf_common.C (renamed from src/usr/diag/prdf/common/plat/mem/prdfCenMembuf.C)4
-rw-r--r--src/usr/diag/prdf/common/plat/cen/prdf_plat_cen.mk1
-rw-r--r--src/usr/diag/prdf/common/plat/mem/prdf_plat_mem.mk3
-rwxr-xr-xsrc/usr/diag/prdf/makefile3
-rw-r--r--src/usr/diag/prdf/plat/cen/prdfCenMembuf.C47
-rw-r--r--src/usr/diag/prdf/plat/cen/prdf_plat_cen_hb_only.mk58
-rw-r--r--src/usr/diag/prdf/runtime/makefile1
7 files changed, 112 insertions, 5 deletions
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfCenMembuf.C b/src/usr/diag/prdf/common/plat/cen/prdfCenMembuf_common.C
index 8c57b4baf..102967617 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfCenMembuf.C
+++ b/src/usr/diag/prdf/common/plat/cen/prdfCenMembuf_common.C
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: src/usr/diag/prdf/common/plat/mem/prdfCenMembuf.C $ */
+/* $Source: src/usr/diag/prdf/common/plat/cen/prdfCenMembuf_common.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2017 */
+/* Contributors Listed Below - COPYRIGHT 2017,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
diff --git a/src/usr/diag/prdf/common/plat/cen/prdf_plat_cen.mk b/src/usr/diag/prdf/common/plat/cen/prdf_plat_cen.mk
index f9d2d62ba..0d5b7b5f6 100644
--- a/src/usr/diag/prdf/common/plat/cen/prdf_plat_cen.mk
+++ b/src/usr/diag/prdf/common/plat/cen/prdf_plat_cen.mk
@@ -42,4 +42,5 @@ prd_obj += prdfCenMbaDomain.o
# plat/cen/ (rule plugin related)
prd_rule_plugin += prdfCenMba_common.o
+prd_rule_plugin += prdfCenMembuf_common.o
diff --git a/src/usr/diag/prdf/common/plat/mem/prdf_plat_mem.mk b/src/usr/diag/prdf/common/plat/mem/prdf_plat_mem.mk
index c3a1c3340..771f3359e 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdf_plat_mem.mk
+++ b/src/usr/diag/prdf/common/plat/mem/prdf_plat_mem.mk
@@ -5,7 +5,7 @@
#
# OpenPOWER HostBoot Project
#
-# Contributors Listed Below - COPYRIGHT 2016,2017
+# Contributors Listed Below - COPYRIGHT 2016,2018
# [+] International Business Machines Corp.
#
#
@@ -51,7 +51,6 @@ prd_obj += prdfMemUtils.o
prd_obj += prdfMemThresholds.o
# rule plugin related
-prd_rule_plugin += prdfCenMembuf.o
prd_rule_plugin += prdfP9Mca_common.o
prd_rule_plugin += prdfP9Mcbist_common.o
diff --git a/src/usr/diag/prdf/makefile b/src/usr/diag/prdf/makefile
index bcca55bf8..01c0d7d26 100755
--- a/src/usr/diag/prdf/makefile
+++ b/src/usr/diag/prdf/makefile
@@ -5,7 +5,7 @@
#
# OpenPOWER HostBoot Project
#
-# Contributors Listed Below - COPYRIGHT 2012,2016
+# Contributors Listed Below - COPYRIGHT 2012,2018
# [+] International Business Machines Corp.
#
#
@@ -41,6 +41,7 @@ include common/framework/prdf_framework.mk
include common/plat/p9/prdf_plat_p9.mk
include common/plat/cen/prdf_plat_cen.mk
include common/plat/mem/prdf_plat_mem.mk
+include plat/cen/prdf_plat_cen_hb_only.mk
include plat/mem/prdf_plat_mem_hb_only.mk
VPATH += ${prd_vpath}
diff --git a/src/usr/diag/prdf/plat/cen/prdfCenMembuf.C b/src/usr/diag/prdf/plat/cen/prdfCenMembuf.C
new file mode 100644
index 000000000..bcc13efc9
--- /dev/null
+++ b/src/usr/diag/prdf/plat/cen/prdfCenMembuf.C
@@ -0,0 +1,47 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/usr/diag/prdf/plat/cen/prdfCenMembuf.C $ */
+/* */
+/* OpenPOWER HostBoot Project */
+/* */
+/* Contributors Listed Below - COPYRIGHT 2018 */
+/* [+] 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. */
+/* You may obtain a copy of the License at */
+/* */
+/* http://www.apache.org/licenses/LICENSE-2.0 */
+/* */
+/* Unless required by applicable law or agreed to in writing, software */
+/* distributed under the License is distributed on an "AS IS" BASIS, */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */
+/* implied. See the License for the specific language governing */
+/* permissions and limitations under the License. */
+/* */
+/* IBM_PROLOG_END_TAG */
+
+// Framework includes
+#include <iipServiceDataCollector.h>
+#include <prdfExtensibleChip.H>
+#include <prdfPluginDef.H>
+#include <prdfPluginMap.H>
+
+// Platform includes
+
+using namespace TARGETING;
+
+namespace PRDF
+{
+
+using namespace PlatServices;
+
+namespace cen_centaur
+{
+
+} // end namespace cen_centaur
+
+} // end namespace PRDF
+
diff --git a/src/usr/diag/prdf/plat/cen/prdf_plat_cen_hb_only.mk b/src/usr/diag/prdf/plat/cen/prdf_plat_cen_hb_only.mk
new file mode 100644
index 000000000..cd4246b74
--- /dev/null
+++ b/src/usr/diag/prdf/plat/cen/prdf_plat_cen_hb_only.mk
@@ -0,0 +1,58 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/plat/cen/prdf_plat_cen_hb_only.mk $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2016,2018
+# [+] 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+
+# NOTE: PRD_SRC_PATH and PRD_INC_PATH must be defined before including this file
+
+################################################################################
+# Paths common to both IPL and runtime
+################################################################################
+
+prd_vpath += ${PRD_SRC_PATH}/plat/cen
+
+prd_incpath += ${PRD_SRC_PATH}/plat/cen
+
+################################################################################
+# Hostboot only object files common to both IPL and runtime
+################################################################################
+
+# plat/cen/ (rule plugin related)
+prd_rule_plugin += prdfCenMembuf.o
+
+################################################################################
+# Hostboot only object files (IPL only)
+################################################################################
+
+ifneq (${HOSTBOOT_RUNTIME},1)
+
+endif
+
+################################################################################
+# Hostboot only object files (runtime only)
+################################################################################
+
+ifeq (${HOSTBOOT_RUNTIME},1)
+
+endif
+
diff --git a/src/usr/diag/prdf/runtime/makefile b/src/usr/diag/prdf/runtime/makefile
index 494d052bb..a012700f4 100644
--- a/src/usr/diag/prdf/runtime/makefile
+++ b/src/usr/diag/prdf/runtime/makefile
@@ -40,6 +40,7 @@ include ../common/framework/prdf_framework.mk
include ../common/plat/p9/prdf_plat_p9.mk
include ../common/plat/cen/prdf_plat_cen.mk
include ../common/plat/mem/prdf_plat_mem.mk
+include ../plat/cen/prdf_plat_cen_hb_only.mk
include ../plat/mem/prdf_plat_mem_hb_only.mk
include ../plat/p9/prdf_plat_p9_hb_only.mk
OpenPOWER on IntegriCloud