From 0d8c248cc29e659ab67fffcd26f54a660569ab8a 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/36010 Reviewed-by: Hostboot Team Reviewed-by: Sachin Gupta --- src/import/tools/imageProcs/p9_ipl_build.C | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/import/tools') diff --git a/src/import/tools/imageProcs/p9_ipl_build.C b/src/import/tools/imageProcs/p9_ipl_build.C index 005a091f..142a4303 100644 --- a/src/import/tools/imageProcs/p9_ipl_build.C +++ b/src/import/tools/imageProcs/p9_ipl_build.C @@ -53,7 +53,6 @@ #include #include -using namespace P9_TOR; /// /// @brief retrieve a block of DD level rings from the unsigned hw image @@ -105,7 +104,7 @@ int get_dd_level_rings_from_hw_image( char* i_hwImage, // Call the first time to get a size of the pending section rc = tor_get_block_of_rings( ringsSection, i_ddLevel, - SBE, + PT_SBE, l_ringType, BASE, unused_parm, @@ -133,7 +132,7 @@ int get_dd_level_rings_from_hw_image( char* i_hwImage, { rc = tor_get_block_of_rings( ringsSection, i_ddLevel, - SBE, + PT_SBE, l_ringType, BASE, unused_parm, -- cgit v1.2.1