re-enable CRC generation for BPM firmware binary

Turns back on the functionality to generate a BPM firmware image with
calculated CRC included in it. This was turned off temporarily to allow
CI to pass on the primary commit and be used as a pre-req to a CMVC
feature.

Change-Id: Ibe382fc6adf3da820caa668ffc45c33cb30b26ae
RTC: 212446
CMVC-Prereq:1087492
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/80765
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@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: William G Hoffa <wghoffa@us.ibm.com>

src/build/buildpnor/buildBpmFlashImages.pl

@@ -119,13 +119,10 @@ sub generateFirmwareImage
     my ($i_fileName, $i_outputDir) = @_;
     my $this_func = (caller(0))[3];
 
-#    my $intermediateFileName = generateIntermediateImage($i_fileName);
-#
-#    open my $inputFileHandle, '<:encoding(UTF-8)', $intermediateFileName
-#        or die "Failed to open $intermediateFileName";
+    my $intermediateFileName = generateIntermediateImage($i_fileName);
 
-    open my $inputFileHandle, '<:encoding(UTF-8)', $i_fileName
-        or die "Failed to open $i_fileName";
+    open my $inputFileHandle, '<:encoding(UTF-8)', $intermediateFileName
+        or die "Failed to open $intermediateFileName";
 
     my ($name, @version) = generateOutputNameAndVersion($i_fileName);
 
@@ -257,8 +254,7 @@ sub generateFirmwareImage
 
     if (!defined($blocks))
     {
-        die "Unable to process image file: $i_fileName";
-        #die "Unable to process image file: $intermediateFileName";
+        die "Unable to process image file: $intermediateFileName";
     }
 
     # Write the version information to the file.
@@ -275,9 +271,9 @@ sub generateFirmwareImage
         or die "Failed to write to output file: $imageFile";
 
     close $inputFileHandle
-        or die "Failed to close input file: $i_fileName";
-#    unlink $intermediateFileName
-#        or die "Failed to remove temporary file $intermediateFileName";
+        or die "Failed to close input file: $intermediateFileName";
+    unlink $intermediateFileName
+        or die "Failed to remove temporary file $intermediateFileName";
     close $outputFileHandle
         or die "Failed to close output file: $imageFile";
 }