summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Derksen <mderkse1@us.ibm.com>2019-12-12 12:44:56 -0600
committerDaniel M Crowell <dcrowell@us.ibm.com>2019-12-19 15:09:49 -0600
commite22bb40fb9c10482e7ea659cc46dd35cad8bb149 (patch)
tree8e25372db7885d526241a87b4995ac74203df36b
parent4638dc513da1390ce3652f34c51f39ac454e8953 (diff)
downloadtalos-hostboot-e22bb40fb9c10482e7ea659cc46dd35cad8bb149.tar.gz
talos-hostboot-e22bb40fb9c10482e7ea659cc46dd35cad8bb149.zip
Fix reporting eecache if no record specified
eecache_editor.pl failed to run if no valid matching record was specified to the script. We want it to just dump the parsed version of the entire cache in that case. Change-Id: Ic010d3540aa71c8104de0e1945b91bab8f456d7d Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/88559 Tested-by: Jenkins Server <pfd-jenkins+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> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Chen Du <duchen@us.ibm.com> Reviewed-by: Christian R Geddes <crgeddes@us.ibm.com> Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
-rwxr-xr-xsrc/build/tools/eecache_editor.pl15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/build/tools/eecache_editor.pl b/src/build/tools/eecache_editor.pl
index c5e3e66ad..262f56376 100755
--- a/src/build/tools/eecache_editor.pl
+++ b/src/build/tools/eecache_editor.pl
@@ -432,10 +432,13 @@ sub parseEecacheToc {
}
# verify uniqueId was built against same version as PNOR's EECACHE
- unless (isUniqueIdValid($uniqueId) && ($headerVersion == $eecacheVersion))
+ if (isUniqueIdValid($uniqueId))
{
- die "PNOR EECACHE version $headerVersion is not same as expected EECACHE version $eecacheVersion!" .
- "Maybe changed expected with --version option";
+ unless (($headerVersion == $eecacheVersion))
+ {
+ die "PNOR EECACHE version $headerVersion is not same as expected EECACHE version $eecacheVersion!" .
+ "Maybe changed expected with --version option";
+ }
}
# header entries start after on 6th byte
@@ -754,7 +757,11 @@ sub parseEecacheToc {
}
else
{
- print "No Match Found! \n\n";
+ # Skip failure message if not looking for a unique id match
+ if (isUniqueIdValid($uniqueId))
+ {
+ print "No Match Found! \n\n";
+ }
}
return \%entryInfo;
OpenPOWER on IntegriCloud