Update adjustHbiPhysSize() Function to handle HBI Expansion

This commit updates adjustHbiPhysSize() function to handle the size
of the HBI partition standing for the --test environment (ie, the
standalone simics environment) by removing outdated (ie, P8)
requirements/references to the location of the HBB partition.

Change-Id: I1fce9d5ec4e6c15c3cc578e9a5cb68f21d7df446
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/62425
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: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: ILYA SMIRNOV <ismirno@us.ibm.com>
Reviewed-by: Marshall J. Wilks <mjwilks@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

1 files changed, 6 insertions, 16 deletions

diff --git a/src/build/buildpnor/PnorUtils.pm b/src/build/buildpnor/PnorUtils.pm
index a4689f598..84eb5924b 100644
--- a/src/build/buildpnor/PnorUtils.pm
+++ b/src/build/buildpnor/PnorUtils.pm
@@ -372,8 +372,7 @@ sub checkSpaceConstraints
             if ($testRun && $eyeCatch eq "HBI")
             {
                 print "Adjusting HBI size - ran out of space for test cases\n";
-                my $hbbKey = findLayoutKeyByEyeCatch("HBB", \%$i_pnorLayoutRef);
-                adjustHbiPhysSize(\%sectionHash, $layoutKey, $filesize, $hbbKey);
+                adjustHbiPhysSize(\%sectionHash, $layoutKey, $filesize);
             }
             else
             {
@@ -387,11 +386,11 @@ sub checkSpaceConstraints
 
 ###############################################################################
 # adjustHbiPhysSize - Adjust HBI physical size when running test cases and fix
-#                     up physical offsets of partitions between HBI and HBB
+#                     up physical offsets of partitions after it
 ################################################################################
 sub adjustHbiPhysSize
 {
-    my ($i_sectionHashRef, $i_hbiKey, $i_filesize, $i_hbbKey) = @_;
+    my ($i_sectionHashRef, $i_hbiKey, $i_filesize) = @_;
 
     my %sectionHash = %$i_sectionHashRef;
 
@@ -407,20 +406,11 @@ sub adjustHbiPhysSize
     # Fix up physical offset affected by HBI size change
     foreach my $section (keys %sectionHash)
     {
-        # Only fix partitions after HBI and before HBB
-        if ( ( $sectionHash{$section}{physicalOffset} >
-               $sectionHash{$i_hbiKey}{physicalOffset} ) &&
-             ( $sectionHash{$section}{physicalOffset} <
-               $sectionHash{$i_hbbKey}{physicalOffset} )
-            )
+        # Only fix partitions after HBI
+        if ( $sectionHash{$section}{physicalOffset} >
+             $sectionHash{$i_hbiKey}{physicalOffset} )
         {
             $sectionHash{$section}{physicalOffset} += $hbi_move;
-            # Ensure section adjustment does not cause an overlap with HBB
-            if ($sectionHash{$section}{physicalOffset} >
-                $sectionHash{$i_hbbKey}{physicalOffset})
-            {
-                die "Error detected $sectionHash{$section}{eyeCatch}'s adjusted size overlaps HBB";
-            }
         }
     }
 }