Verify HBB in HBBL using ROM code

Puts ROM code into the HBBL image page aligned after
the end of HBBL

Change-Id: I1a07dd912c07557b2a43dfbadc5394a7d212c841
RTC: 143902
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34293
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 20 insertions, 5 deletions

diff --git a/src/build/debug/Hostboot/BlTrace.pm b/src/build/debug/Hostboot/BlTrace.pm
index aeecf2ec4..ce8e526fd 100644
--- a/src/build/debug/Hostboot/BlTrace.pm
+++ b/src/build/debug/Hostboot/BlTrace.pm
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2016,2017
 # [+] International Business Machines Corp.
 #
 #
@@ -34,8 +34,11 @@ my %traceText = (
     "11" => "Main getHBBSection returned",
     "12" => "Main handleMMIO to working location returned",
     "13" => "Main removeECC returned",
-    "14" => "Main applySecureSignatureValidation returned",
-    "15" => "Main copy HBB to running location done",
+    # @TODO RTC:167740 remove magic number check once fsp/op signs HBB
+    "14" => "main verifyBaseImage skip verification - no magic number ",
+    "15" => "main verifyBaseImage started",
+    "16" => "main verifyBaseImage succeeded",
+    "17" => "Main copy HBB to running location done",
     "20" => "HandleMMIO started",
     "21" => "HandleMMIO started using BYTESIZE",
     "24" => "HandleMMIO started using WORDSIZE",
@@ -71,6 +74,7 @@ my %traceText = (
     "F8" => "Utils parseEntries size extends beyond Flash",
     "F9" => "PNOR Access getHBBSection findTOC error",
     "FA" => "PNOR Access getHBBSection findTOC no HBB section",
+    "FB" => "main verifyBaseImage failed",
 );
 
 sub formatTrace
@@ -97,9 +101,20 @@ sub formatTrace
             $traceDataRaw .= " ";
         }
 
-        if ($traceText{$traceHexStr} ne "")
+        if (exists $traceText{$traceHexStr})
         {
-            $traceDataText .= "$traceHexStr  $traceText{$traceHexStr}\n";
+            if ($traceText{$traceHexStr} ne "")
+            {
+                $traceDataText .= "$traceHexStr  $traceText{$traceHexStr}\n";
+            }
+            else
+            {
+                $traceDataText .= "$traceHexStr  NO TRACE TEXT FOUND - check BlTrace.pm\n";
+            }
+        }
+        else
+        {
+            $traceDataText .= "$traceHexStr  UNKNOWN HEX FOUND - check BlTrace.pm\n";
         }
     }