summaryrefslogtreecommitdiffstats
path: root/src/usr/xscom
diff options
context:
space:
mode:
authorDan Crowell <dcrowell@us.ibm.com>2012-09-26 14:40:04 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2012-10-04 14:00:03 -0500
commit60bb82b0bdb0564f677a7765e1860dde19eae5e5 (patch)
tree0166eda4077f7e683fbad550586d39a23b620f1b /src/usr/xscom
parent73a46b3598a525c559b23892d2da2d620a26a34b (diff)
downloadblackbird-hostboot-60bb82b0bdb0564f677a7765e1860dde19eae5e5.tar.gz
blackbird-hostboot-60bb82b0bdb0564f677a7765e1860dde19eae5e5.zip
Remove Salerno and non-present Murano units
Change-Id: I64c2d979d3b7a92ef6563e52cf6a3459a4ba7cd2 RTC: 45796 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1896 Tested-by: Jenkins Server Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/xscom')
-rw-r--r--src/usr/xscom/xscom.C47
-rw-r--r--src/usr/xscom/xscom.H46
2 files changed, 46 insertions, 47 deletions
diff --git a/src/usr/xscom/xscom.C b/src/usr/xscom/xscom.C
index d2ef0f254..2f1308468 100644
--- a/src/usr/xscom/xscom.C
+++ b/src/usr/xscom/xscom.C
@@ -1,26 +1,25 @@
-/* IBM_PROLOG_BEGIN_TAG
- * This is an automatically generated prolog.
- *
- * $Source: src/usr/xscom/xscom.C $
- *
- * IBM CONFIDENTIAL
- *
- * COPYRIGHT International Business Machines Corp. 2011-2012
- *
- * p1
- *
- * Object Code Only (OCO) source materials
- * Licensed Internal Code Source Materials
- * IBM HostBoot Licensed Internal Code
- *
- * The source code for this program is not published or other-
- * wise divested of its trade secrets, irrespective of what has
- * been deposited with the U.S. Copyright Office.
- *
- * Origin: 30
- *
- * IBM_PROLOG_END_TAG
- */
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/usr/xscom/xscom.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2011,2012 */
+/* */
+/* p1 */
+/* */
+/* Object Code Only (OCO) source materials */
+/* Licensed Internal Code Source Materials */
+/* IBM HostBoot Licensed Internal Code */
+/* */
+/* The source code for this program is not published or otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
/**
* @file xscom.C
*
@@ -214,7 +213,7 @@ uint8_t getMaxChipsPerNode()
ProcessorCoreType l_coreType = cpu_core_type();
//@todo - Need to verify if this number is correct
- // for both Salerno and Venice
+ // for both Murano and Venice
switch (l_coreType)
{
case CORE_POWER8_MURANO:
diff --git a/src/usr/xscom/xscom.H b/src/usr/xscom/xscom.H
index 88cb0aeaf..6efc48274 100644
--- a/src/usr/xscom/xscom.H
+++ b/src/usr/xscom/xscom.H
@@ -1,25 +1,25 @@
-// IBM_PROLOG_BEGIN_TAG
-// This is an automatically generated prolog.
-//
-// $Source: src/usr/xscom/xscom.H $
-//
-// IBM CONFIDENTIAL
-//
-// COPYRIGHT International Business Machines Corp. 2011
-//
-// p1
-//
-// Object Code Only (OCO) source materials
-// Licensed Internal Code Source Materials
-// IBM HostBoot Licensed Internal Code
-//
-// The source code for this program is not published or other-
-// wise divested of its trade secrets, irrespective of what has
-// been deposited with the U.S. Copyright Office.
-//
-// Origin: 30
-//
-// IBM_PROLOG_END
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/usr/xscom/xscom.H $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2011,2012 */
+/* */
+/* p1 */
+/* */
+/* Object Code Only (OCO) source materials */
+/* Licensed Internal Code Source Materials */
+/* IBM HostBoot Licensed Internal Code */
+/* */
+/* The source code for this program is not published or otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
#ifndef __XSCOM_H
#define __XSCOM_H
@@ -83,7 +83,7 @@ errlHndl_t xscomPerformOp(DeviceFW::OperationType i_opType,
va_list i_args);
/**
- * @brief Abstracts HMER register of a P8/Salerno chip
+ * @brief Abstracts HMER register of a P8 (Murano/Venice) chip
*/
class HMER
{
OpenPOWER on IntegriCloud