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/p9/procedures/hwp/memory/mss.H | |
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/p9/procedures/hwp/memory/mss.H')
-rw-r--r-- | src/import/chips/p9/procedures/hwp/memory/mss.H | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/mss.H b/src/import/chips/p9/procedures/hwp/memory/mss.H index df176cee7..f8c5dabf9 100644 --- a/src/import/chips/p9/procedures/hwp/memory/mss.H +++ b/src/import/chips/p9/procedures/hwp/memory/mss.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2018 */ +/* Contributors Listed Below - COPYRIGHT 2016,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -42,6 +42,11 @@ #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> +// This is ok here so long as we don't include this header in any other header, +// unless it's in a non-firmware path (lab, unit tests, etc). +// This is to prevent our DEFAULTs from spilling over where we don't want them. +#include <lib/shared/nimbus_defaults.H> + #include <lib/shared/mss_const.H> #include <lib/shared/mss_kind.H> |