From 14732bcb69ba7d79ef6446d676cb66101f39a05b Mon Sep 17 00:00:00 2001 From: Claus Michael Olsen Date: Wed, 24 Jan 2018 17:48:37 -0600 Subject: Additional risk level support - (step 1) Backward compatibility The purpose of this commit is to avoid a coreq situation by ensuring this commit is fully propagated through our repos and test drivers before introducing the change to the new HW image with two RLs. The commit enables simultaneous support for producing a HW image and retrieving rings from an image that has either one or two risk level (RL) rings in the .rings section. The commit however does NOT actually, yet, make any changes to the image which is the aim of the (step 2) commit 53292. Nor does this commit generate any raw ring files or process any RL2 level rings yet. Again this will happen in 53292. The commit also includes, - various related cleanups in data naming and ring file processing, - some data and invironment specific parts in ring_apply.C have been moved to common_ringId.C. Key_Cronus_Test=XIP_REGRESS HW-Image-Prereq=53292 - This commit (52659) must be fully merged before merging 53292. Change-Id: I6a7e9fb361077db8a234881d36801de7bfc7183e Original-Change-Id: I402d53c4a3ca6a084c958321069cc6f60e04ad24 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52659 Tested-by: FSP CI Jenkins Tested-by: Cronus HW CI Dev-Ready: Joseph J. McGill Reviewed-by: Joseph J. McGill Tested-by: Jenkins Server Tested-by: HWSV CI Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: Jennifer A. Stofer --- import/chips/p9/utils/imageProcs/p9_tor.C | 1 + 1 file changed, 1 insertion(+) (limited to 'import/chips/p9/utils') diff --git a/import/chips/p9/utils/imageProcs/p9_tor.C b/import/chips/p9/utils/imageProcs/p9_tor.C index 8a1ae424..769e6dad 100644 --- a/import/chips/p9/utils/imageProcs/p9_tor.C +++ b/import/chips/p9/utils/imageProcs/p9_tor.C @@ -92,6 +92,7 @@ int get_ring_from_ring_section( void* i_ringSection, // Ring secti { rc = ringid_get_properties( chipType, torMagic, + torHeader->version, iCplt, &cpltData, &ringIdListCommon, -- cgit v1.2.1