Centaur ring support - ring_apply and ring data

- Introduces Centaur ring ID header files and ring_apply support to generate
  a separate Centaur ring image file.
- Introduces common ring ID header file consumed by both P9 and Centaur and
  all user codes, e.g. putRing, ipl_build, xip_tool, etc.
- Introduces a namespace approach for complete separation of P9 and Centaur
  ring data and to facilitate execution time selection of either P9 and
  Centaur ring data.
- Added Centaur image .rings generation function to p9_ring_apply.
- This commit does NOT support Centaur in the TOR API nor in xip_tool. See
  commit 38018 for that support.
- Modified hw_image.mk file to support Centaur XIP image generation.
- Updated ring_apply to also support .overrides ring gen for Centaur.

Change-Id: I12a27b194dc14d906fea7bc273eb9f766f0fc5bf
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35639
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sumit Kumar <sumit_kumar@in.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36010
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/import/chips/p9/utils/p9_putRingUtils.C b/src/import/chips/p9/utils/p9_putRingUtils.C
index c18b1d68..8f8b6689 100644
--- a/src/import/chips/p9/utils/p9_putRingUtils.C
+++ b/src/import/chips/p9/utils/p9_putRingUtils.C
@@ -34,7 +34,7 @@
 #include <p9_putRingUtils.H>
 #include <p9_scan_compression.H>
 
-using namespace RING_TYPES;
+//using namespace RING_TYPES;
 namespace RS4
 {
 
@@ -159,10 +159,10 @@ uint32_t rs4_revle32(const uint32_t i_x)
 }
 }; //end of namespace
 
-void getRingProperties(const RingID i_ringId,
+void getRingProperties(const RingId_t i_ringId,
                        uint32_t& o_torOffset,
-                       RINGTYPE& o_ringType,
-                       CHIPLET_TYPE& o_chipletType)
+                       RingType_t& o_ringType,
+                       ChipletType_t& o_chipletType)
 {
     do
     {
@@ -171,7 +171,7 @@ void getRingProperties(const RingID i_ringId,
             (INSTANCE_RING_MASK & (RING_PROPERTIES[i_ringId].iv_torOffSet));
         o_chipletType = RING_PROPERTIES[i_ringId].iv_type;
 
-        if(INVALID_RING == o_torOffset)
+        if(INVALID_RING_OFFSET == o_torOffset)
         {
             break;
         }
@@ -387,7 +387,7 @@ fapi2::ReturnCode setupScanRegion(const fapi2::Target<fapi2::TARGET_TYPE_ALL>&
                                   i_target,
                                   uint64_t i_scanRegion,
                                   const uint8_t i_chipletId,
-                                  const RINGTYPE i_ringType)
+                                  const RingType_t i_ringType)
 {
     fapi2::ReturnCode l_rc;
     uint32_t l_chiplet =  i_chipletId << 24;
@@ -401,7 +401,7 @@ fapi2::ReturnCode setupScanRegion(const fapi2::Target<fapi2::TARGET_TYPE_ALL>&
     }
 
     if ((fapi2::TARGET_TYPE_EX & (i_target.get().getFapiTargetType())) &&
-        (i_ringType != INSTANCE_RING ))
+        (i_ringType != INSTANCE_RING))
     {
         // this gives position of ex (0 or 1)
         uint32_t l_ex_number = i_target.get().getTargetInstance();
@@ -1126,7 +1126,7 @@ fapi2::ReturnCode rs4DecompressionSvc(
     const uint8_t* i_rs4,
     bool i_applyOverride,
     const fapi2::RingMode i_ringMode,
-    const RINGTYPE i_ringType)
+    const RingType_t i_ringType)
 {
     FAPI_INF(">> rs4DecompressionSvc");
     CompressedScanData* l_rs4Header = (CompressedScanData*) i_rs4;