diff options
author | Louis Stermole <stermole@us.ibm.com> | 2019-03-22 18:48:29 -0400 |
---|---|---|
committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2019-04-05 18:00:23 -0500 |
commit | 54a9c7b4a9e85d7d49a38e3d5e3f2407241cde13 (patch) | |
tree | 052d3e7646a5905d7a4a940a98fbe77333ee0ed1 /src/import/chips/ocmb | |
parent | acd09d45c209ec014825cb7539aaab357493ea42 (diff) | |
download | talos-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/ocmb')
4 files changed, 26 insertions, 2 deletions
diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_check_for_ready.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_check_for_ready.C index c162a9d15..6a7b0d894 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_check_for_ready.C +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_check_for_ready.C @@ -34,6 +34,7 @@ // *HWP Consumed by: FSP:HB #include <fapi2.H> +#include <lib/shared/exp_defaults.H> #include <exp_check_for_ready.H> #include <lib/i2c/exp_i2c.H> #include <generic/memory/lib/utils/poll.H> diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_draminit_mc.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_draminit_mc.C index 9719e612c..be2d4e36f 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_draminit_mc.C +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_draminit_mc.C @@ -34,6 +34,7 @@ #include <fapi2.H> +#include <lib/shared/exp_defaults.H> #include <generic/memory/lib/utils/c_str.H> #include <generic/memory/lib/utils/find.H> #include <generic/memory/lib/utils/count_dimm.H> diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H index 9d4857b72..5bc631f0c 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H @@ -41,8 +41,6 @@ namespace mss { -constexpr mss::mc_type DEFAULT_MC_TYPE = mss::mc_type::EXPLORER; - namespace exp { diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_defaults.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_defaults.H index 39491810f..999e93425 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_defaults.H +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_defaults.H @@ -22,3 +22,27 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ + +/// +/// @file exp_defaults.H +/// @brief default types associated with Nimbus system +/// +// *HWP HWP Owner: Andre A. Marin <aamarin@us.ibm.com> +// *HWP HWP Backup: Louis Stermole <stermole@us.ibm.com> +// *HWP Team: Memory +// *HWP Level: 2 +// *HWP Consumed by: CI + +#ifndef _MSS_NIMBUS_DEFAULTS_H_ +#define _MSS_NIMBUS_DEFAULTS_H_ + +#include <generic/memory/lib/utils/shared/mss_generic_consts.H> + +namespace mss +{ + +constexpr mss::mc_type DEFAULT_MC_TYPE = mss::mc_type::EXPLORER; + +} // ns mss + +#endif |