From e22bb40fb9c10482e7ea659cc46dd35cad8bb149 Mon Sep 17 00:00:00 2001 From: Matt Derksen Date: Thu, 12 Dec 2019 12:44:56 -0600 Subject: 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 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Chen Du Reviewed-by: Christian R Geddes Reviewed-by: Daniel M Crowell --- src/build/tools/eecache_editor.pl | 15 +++++++++++---- 1 file 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; -- cgit v1.2.1