summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Peschke <mpeschke@de.ibm.com>2017-02-28 19:32:00 +0100
committerJoshua Hunsberger <jahunsbe@us.ibm.com>2017-10-23 17:10:12 -0500
commitca9f3ccb233ab344bfbb397b345eb8f245779d46 (patch)
tree8d1e47b23d260e8428d6b5aa6ccc9807673c6abb
parent0b3fa458ef45d2bd8973f5fdc28d0f161accf1d3 (diff)
downloadtalos-hcode-ca9f3ccb233ab344bfbb397b345eb8f245779d46.tar.gz
talos-hcode-ca9f3ccb233ab344bfbb397b345eb8f245779d46.zip
p9_xip_tool: fix ring dissect warnings
Fixes "Ambiguity on input PARMS for calling SEEPROM Ring copy API." for p9_xip_tool <SEEPROM image> dissect .ring Change-Id: If82dddc3a6eba516b0a5ba9bc213074095daee41 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37201 Reviewed-by: Claus M. Olsen <cmolsen@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Reviewed-by: Sumit Kumar <sumit_kumar@in.ibm.com> Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
-rw-r--r--import/chips/p9/xip/p9_xip_tool.C7
1 files changed, 7 insertions, 0 deletions
diff --git a/import/chips/p9/xip/p9_xip_tool.C b/import/chips/p9/xip/p9_xip_tool.C
index eb8c1fc2..a7f8afb9 100644
--- a/import/chips/p9/xip/p9_xip_tool.C
+++ b/import/chips/p9/xip/p9_xip_tool.C
@@ -1870,6 +1870,13 @@ int dissectRingSectionTor( void* i_ringSection,
for (ppeType = 0; ppeType < NUM_PPE_TYPES; ppeType++)
{
+ if ((i_imageMagicNo == P9_XIP_MAGIC_SGPE && ppeType != SGPE) ||
+ (i_imageMagicNo == P9_XIP_MAGIC_CME && ppeType != CME) ||
+ (i_imageMagicNo == P9_XIP_MAGIC_SEEPROM && ppeType != SBE))
+ {
+ continue;
+ }
+
//--------------------
// Ring variant loop.
// - Base, cache, risk, override, overlay
OpenPOWER on IntegriCloud