summaryrefslogtreecommitdiffstats
path: root/src/import/chips/p9a
diff options
context:
space:
mode:
authorLouis Stermole <stermole@us.ibm.com>2019-03-22 18:48:29 -0400
committerChristian R. Geddes <crgeddes@us.ibm.com>2019-04-05 18:00:23 -0500
commit54a9c7b4a9e85d7d49a38e3d5e3f2407241cde13 (patch)
tree052d3e7646a5905d7a4a940a98fbe77333ee0ed1 /src/import/chips/p9a
parentacd09d45c209ec014825cb7539aaab357493ea42 (diff)
downloadtalos-hostboot-54a9c7b4a9e85d7d49a38e3d5e3f2407241cde13.tar.gz
talos-hostboot-54a9c7b4a9e85d7d49a38e3d5e3f2407241cde13.zip
Fix duplicate symbol errors from DEFAULT_MC_TYPE
Change-Id: I7a5a40c0f0ab6a809e6906ad40e26fa473cfb286 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/74903 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com> Reviewed-by: Mark Pizzutillo <mark.pizzutillo@ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/74908 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9a')
-rw-r--r--src/import/chips/p9a/procedures/hwp/memory/lib/shared/axone_consts.H7
-rw-r--r--src/import/chips/p9a/procedures/hwp/memory/lib/shared/axone_defaults.H25
-rw-r--r--src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train.C1
-rw-r--r--src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train_check.C1
4 files changed, 27 insertions, 7 deletions
diff --git a/src/import/chips/p9a/procedures/hwp/memory/lib/shared/axone_consts.H b/src/import/chips/p9a/procedures/hwp/memory/lib/shared/axone_consts.H
index 9c81f7dbd..c2ef9aee8 100644
--- a/src/import/chips/p9a/procedures/hwp/memory/lib/shared/axone_consts.H
+++ b/src/import/chips/p9a/procedures/hwp/memory/lib/shared/axone_consts.H
@@ -39,11 +39,4 @@
#include <generic/memory/lib/utils/shared/mss_generic_consts.H>
-namespace mss
-{
-
-constexpr mss::proc_type DEFAULT_PROC_TYPE = mss::proc_type::AXONE;
-
-}// mss
-
#endif
diff --git a/src/import/chips/p9a/procedures/hwp/memory/lib/shared/axone_defaults.H b/src/import/chips/p9a/procedures/hwp/memory/lib/shared/axone_defaults.H
index 12052a3e7..831612e10 100644
--- a/src/import/chips/p9a/procedures/hwp/memory/lib/shared/axone_defaults.H
+++ b/src/import/chips/p9a/procedures/hwp/memory/lib/shared/axone_defaults.H
@@ -22,3 +22,28 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
+
+///
+/// @file axone_defaults.H
+/// @brief default types associated with Nimbus system
+///
+// *HWP HWP Owner: Andre Marin <aamarin@us.ibm.com>
+// *HWP HWP Backup: Stephen Glancy <sglancy@us.ibm.com>
+// *HWP Team: Memory
+// *HWP Level: 3
+// *HWP Consumed by: HB:FSP
+
+#ifndef _MSS_AXONE_DEFAULTS_H_
+#define _MSS_AXONE_DEFAULTS_H_
+
+#include <generic/memory/lib/utils/shared/mss_generic_consts.H>
+
+namespace mss
+{
+
+constexpr mss::proc_type DEFAULT_PROC_TYPE = mss::proc_type::AXONE;
+constexpr mss::mc_type DEFAULT_MC_TYPE = mss::mc_type::EXPLORER;
+
+} // ns mss
+
+#endif
diff --git a/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train.C b/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train.C
index 2ade12916..70202d95f 100644
--- a/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train.C
+++ b/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train.C
@@ -33,6 +33,7 @@
// *HWP Level: 3
// *HWP Consumed by: Memory
+#include <lib/shared/axone_defaults.H>
#include <p9a_omi_train.H>
#include <fapi2.H>
diff --git a/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train_check.C b/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train_check.C
index cc9d8008d..50119a44d 100644
--- a/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train_check.C
+++ b/src/import/chips/p9a/procedures/hwp/memory/p9a_omi_train_check.C
@@ -33,6 +33,7 @@
// *HWP Level: 3
// *HWP Consumed by: Memory
+#include <lib/shared/axone_defaults.H>
#include <p9a_omi_train_check.H>
#include <fapi2.H>
OpenPOWER on IntegriCloud