summaryrefslogtreecommitdiffstats
path: root/src/import/chips/p9/utils/imageProcs/p9_ring_identification.H
diff options
context:
space:
mode:
authorSumit Kumar <sumit_kumar@in.ibm.com>2017-01-31 04:50:15 -0600
committerChristian R. Geddes <crgeddes@us.ibm.com>2017-11-01 13:48:36 -0400
commitf43da019dd692145c0f761a537041e5caf451828 (patch)
tree966227d8643eb759a20fba04f00593379adbdbe5 /src/import/chips/p9/utils/imageProcs/p9_ring_identification.H
parentbbd317375f825b30ba0ddea995528a12b5f50b89 (diff)
downloadtalos-hostboot-f43da019dd692145c0f761a537041e5caf451828.tar.gz
talos-hostboot-f43da019dd692145c0f761a537041e5caf451828.zip
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>
Diffstat (limited to 'src/import/chips/p9/utils/imageProcs/p9_ring_identification.H')
-rw-r--r--src/import/chips/p9/utils/imageProcs/p9_ring_identification.H7
1 files changed, 2 insertions, 5 deletions
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 <stdlib.h>
#include <string.h>
-#include <p9_ring_id.h>
+#include <common_ringId.H>
// 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
OpenPOWER on IntegriCloud