Packaging of memory vpd on Nimbus, MCA->MCS

Change from MCA to MCS target. Update decode logic.

Change-Id: I71408c25ce33cf6e342bb704b5d173f8d98229dc
RTC: 144519
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25403
Tested-by: Jenkins Server
Tested-by: PPE CI
Tested-by: Hostboot CI
Reviewed-by: William H. Schwartz <whs@us.ibm.com>
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25471
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

3 files changed, 11 insertions, 11 deletions

diff --git a/import/hwpf/fapi2/include/fapi2_vpd_access.H b/import/hwpf/fapi2/include/fapi2_vpd_access.H
index daf8b006..31909c56 100644
--- a/import/hwpf/fapi2/include/fapi2_vpd_access.H
+++ b/import/hwpf/fapi2/include/fapi2_vpd_access.H
@@ -37,10 +37,10 @@ namespace fapi2
 constexpr uint64_t VPD_INFO_INVALID  = 0xffffffffffffffff;
 
 /// @brief  Specialized class representing required VPDInfo to be used
-///         in collecting VPD for the MCA target type.
-/// @tparam T fapi2::TARGET_TYPE_MCA
+///         in collecting VPD for the MCS target type.
+/// @tparam T fapi2::TARGET_TYPE_MCS
 template<>
-class VPDInfo<TARGET_TYPE_MCA>
+class VPDInfo<TARGET_TYPE_MCS>
 {
     public:
         // @brief VPDInfo constructor
@@ -71,7 +71,7 @@ class VPDInfo<TARGET_TYPE_MCA>
 /// @note passing nullptr for o_blob will return the size of the keyword
 ///
 /// Example:
-/// fapi2::VPDInfo<fapi2::TARGET_TYPE_MCA> vpdInfo(MR_keyword);
+/// fapi2::VPDInfo<fapi2::TARGET_TYPE_MCS> vpdInfo(MR_keyword);
 /// vpdInfo.iv_freq = 2667;
 ///
 /// uint8_t * blob = NULL;
@@ -79,7 +79,7 @@ class VPDInfo<TARGET_TYPE_MCA>
 /// FAPI_TRY(getVPD( mcs, vpdInfo, blob ));
 /// blob = static_cast<uint8_t *>(malloc(vpdInfo.iv_size));
 /// FAPI_TRY(getVPD( mcs, vpdInfo, blob ));
-/// blob now contains the VPD data for the MCA.
+/// blob now contains the VPD data for the MCS.
 ///
 template<TargetType T>
 ReturnCode getVPD(const Target<T>& i_target,
diff --git a/import/hwpf/fapi2/include/plat/plat_vpd_access.H b/import/hwpf/fapi2/include/plat/plat_vpd_access.H
index 6097689a..bf8664f3 100644
--- a/import/hwpf/fapi2/include/plat/plat_vpd_access.H
+++ b/import/hwpf/fapi2/include/plat/plat_vpd_access.H
@@ -30,9 +30,9 @@ namespace fapi2
 {
 // -- platform specific getVPD implementation goes here --
 
-// platform specific for MCA target -- test code only
-inline fapi2::ReturnCode platGetVPD(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& i_target,
-                                    VPDInfo<fapi2::TARGET_TYPE_MCA>& io_vpd_info,
+// platform specific for MCS target -- test code only
+inline fapi2::ReturnCode platGetVPD(const fapi2::Target<fapi2::TARGET_TYPE_MCS>& i_target,
+                                    VPDInfo<fapi2::TARGET_TYPE_MCS>& io_vpd_info,
                                     uint8_t* o_blob)
 {
     fapi2::ReturnCode l_rc = fapi2::FAPI2_RC_SUCCESS;
diff --git a/import/hwpf/fapi2/include/plat/vpd_access.H b/import/hwpf/fapi2/include/plat/vpd_access.H
index ed6fefaf..b227fab1 100644
--- a/import/hwpf/fapi2/include/plat/vpd_access.H
+++ b/import/hwpf/fapi2/include/plat/vpd_access.H
@@ -33,9 +33,9 @@ namespace fapi2
 {
 // -- platform specializations for getVPD go here --
 
-// specialization for MCA target
-template<> fapi2::ReturnCode getVPD(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& i_target,
-                                    VPDInfo<fapi2::TARGET_TYPE_MCA>& io_vpd_info,
+// specialization for MCS target
+template<> fapi2::ReturnCode getVPD(const fapi2::Target<fapi2::TARGET_TYPE_MCS>& i_target,
+                                    VPDInfo<fapi2::TARGET_TYPE_MCS>& io_vpd_info,
                                     uint8_t* o_blob)
 {
     return platGetVPD( i_target, io_vpd_info, o_blob );