From f43da019dd692145c0f761a537041e5caf451828 Mon Sep 17 00:00:00 2001 From: Sumit Kumar Date: Tue, 31 Jan 2017 04:50:15 -0600 Subject: 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 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Sumit Kumar Tested-by: PPE CI Reviewed-by: Richard J. Knight Reviewed-by: Thi N. Tran Tested-by: Hostboot CI Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36011 Reviewed-by: Hostboot Team Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Christian R. Geddes --- src/import/chips/p9/utils/imageProcs/p9_ring_identification.H | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/import/chips/p9/utils/imageProcs/p9_ring_identification.H') diff --git a/src/import/chips/p9/utils/imageProcs/p9_ring_identification.H b/src/import/chips/p9/utils/imageProcs/p9_ring_identification.H index 6117a7bf9..c8fb538aa 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ring_identification.H +++ b/src/import/chips/p9/utils/imageProcs/p9_ring_identification.H @@ -37,13 +37,13 @@ #endif #include #include -#include +#include // MVPD Ring ID list structure. typedef struct { const char* ringName; - RingID ringId; + RingId_t ringId; uint8_t instanceIdMin; // the min instanceId uint8_t instanceIdMax; // the max instanceId uint8_t vpdKeyword; @@ -97,7 +97,4 @@ enum VpdRingClass }; -#define MVPD_END_OF_DATA_MAGIC (uint32_t)0x454E4400 // "END " - - #endif -- cgit v1.2.1