diff options
| author | Matthew Hickman <Matthew.Hickman@ibm.com> | 2019-04-15 16:32:46 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-05-13 10:46:41 -0500 |
| commit | 2b3c06d520853a436ac78050482168752dcd6efd (patch) | |
| tree | 468501e635d138c36c7ba9265a80de9f29093730 /src/import/generic/memory/lib/utils/mcbist | |
| parent | d893f5ac1b3d25eb3bf7799bb601afe8406c7cbc (diff) | |
| download | talos-hostboot-2b3c06d520853a436ac78050482168752dcd6efd.tar.gz talos-hostboot-2b3c06d520853a436ac78050482168752dcd6efd.zip | |
Fixed the ccs port merge conflicts and added lab code
Change-Id: I665ea2460a5ace289b17ae868b07a8876b65a0c8
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75236
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Dev-Ready: STEPHEN GLANCY <sglancy@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: Mark Pizzutillo <mark.pizzutillo@ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76885
Reviewed-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/import/generic/memory/lib/utils/mcbist')
| -rw-r--r-- | src/import/generic/memory/lib/utils/mcbist/gen_address.H | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/import/generic/memory/lib/utils/mcbist/gen_address.H b/src/import/generic/memory/lib/utils/mcbist/gen_address.H index 62b56071f..ca95feb71 100644 --- a/src/import/generic/memory/lib/utils/mcbist/gen_address.H +++ b/src/import/generic/memory/lib/utils/mcbist/gen_address.H @@ -548,24 +548,23 @@ class ecc::fwms::address fapi2::buffer<uint64_t> iv_value; }; -using field = std::pair<uint64_t, uint64_t>; template< mss::mc_type MC, fapi2::TargetType T , typename TT > -constexpr field ecc::fwms::address<MC, T, TT>::DIMM; +constexpr mss::mcbist::address::field ecc::fwms::address<MC, T, TT>::DIMM; template< mss::mc_type MC, fapi2::TargetType T , typename TT > -constexpr field ecc::fwms::address<MC, T, TT>::MRANK; +constexpr mss::mcbist::address::field ecc::fwms::address<MC, T, TT>::MRANK; template< mss::mc_type MC, fapi2::TargetType T , typename TT > -constexpr field ecc::fwms::address<MC, T, TT>::SRANK; +constexpr mss::mcbist::address::field ecc::fwms::address<MC, T, TT>::SRANK; template< mss::mc_type MC, fapi2::TargetType T , typename TT > -constexpr field ecc::fwms::address<MC, T, TT>::BANK_GROUP; +constexpr mss::mcbist::address::field ecc::fwms::address<MC, T, TT>::BANK_GROUP; template< mss::mc_type MC, fapi2::TargetType T , typename TT > -constexpr field ecc::fwms::address<MC, T, TT>::BANK; +constexpr mss::mcbist::address::field ecc::fwms::address<MC, T, TT>::BANK; template< mss::mc_type MC, fapi2::TargetType T , typename TT > -constexpr field ecc::fwms::address<MC, T, TT>::LAST_VALID; +constexpr mss::mcbist::address::field ecc::fwms::address<MC, T, TT>::LAST_VALID; } // close namespace mss |
