Skip to content

Commit

Permalink
Fix reporting eecache if no record specified
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mderkse1 authored and dcrowell77 committed Dec 19, 2019
1 parent 4638dc5 commit e22bb40
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions src/build/tools/eecache_editor.pl
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit e22bb40

Please sign in to comment.