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/36011
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
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>

1 files changed, 8 insertions, 7 deletions

diff --git a/src/import/chips/p9/utils/imageProcs/p9_scan_compression.H b/src/import/chips/p9/utils/imageProcs/p9_scan_compression.H
index 36486de37..158e5ec14 100644
--- a/src/import/chips/p9/utils/imageProcs/p9_scan_compression.H
+++ b/src/import/chips/p9/utils/imageProcs/p9_scan_compression.H
@@ -32,6 +32,7 @@
 #ifndef __ASSEMBLER__
 
 #include <stdint.h>
+#include <common_ringId.H>
 
 /// Compressed Scan Chain Data Structure Format
 ///
@@ -75,7 +76,7 @@ typedef struct
     uint8_t  iv_version;
     uint8_t  iv_type;
     uint16_t iv_size;
-    uint16_t iv_ringId;
+    RingId_t iv_ringId;
     uint32_t iv_scanAddr;
 } CompressedScanData;
 
@@ -118,8 +119,8 @@ compressed_scan_data_translate(CompressedScanData* o_data,
 ///
 /// \param[in] i_scanAddr The 32-bit scan address.
 ///
-/// \param[in] i_ringId The ring ID that uniquely identifies the ring name of
-/// a repair ring. (See p9_ring_id.h for more info.)
+/// \param[in] i_ringId The ring ID that uniquely identifies the ring. (See
+/// <ChipType> ring ID header files for more info.)
 ///
 /// This API is required for integration with PHYP which does not support
 /// malloc().  Applications in environments supporting malloc() can use
@@ -139,7 +140,7 @@ _rs4_compress(CompressedScanData* io_rs4,
               const uint8_t* i_care_str,
               const uint32_t i_length,
               const uint32_t i_scanAddr,
-              const uint16_t i_ringId);
+              const RingId_t i_ringId);
 
 
 /// Compress a scan string using the RS4 compression algorithm
@@ -163,8 +164,8 @@ _rs4_compress(CompressedScanData* io_rs4,
 ///
 /// \param[in] i_scanAddr The 32-bit scan address.
 ///
-/// \param[in] i_ringId The ring ID that uniquely identifies the ring name of
-/// a repair ring. (See p9_ring_id.c for more info.)
+/// \param[in] i_ringId The ring ID that uniquely identifies the ring. (See
+/// <ChipType> ring ID header files for more info.)
 ///
 /// \returns See \ref scan_compression_codes
 int
@@ -173,7 +174,7 @@ rs4_compress(CompressedScanData** o_rs4,
              const uint8_t* i_care_str,
              const uint32_t i_length,
              const uint32_t i_scanAddr,
-             const uint8_t i_ringId);
+             const RingId_t i_ringId);
 
 
 /// Decompress a scan string compressed using the RS4 compression algorithm