diff options
| -rw-r--r-- | src/bootloader/bl_start.S | 6 | ||||
| -rwxr-xr-x | src/build/tools/addimgid | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/bootloader/bl_start.S b/src/bootloader/bl_start.S index 1e3120296..b8da64ae1 100644 --- a/src/bootloader/bl_start.S +++ b/src/bootloader/bl_start.S @@ -6,6 +6,7 @@ # OpenPOWER HostBoot Project # # Contributors Listed Below - COPYRIGHT 2015,2017 +# [+] Google Inc. # [+] International Business Machines Corp. # # @@ -352,11 +353,6 @@ switchToHBB: .section .data - .balign 16 -.global hbi_ImageId -hbi_ImageId: - .space 128 - .global bootloader_end_address bootloader_end_address: .quad HBBL_END_ADDRESS diff --git a/src/build/tools/addimgid b/src/build/tools/addimgid index 255cc431b..69a2f1b2a 100755 --- a/src/build/tools/addimgid +++ b/src/build/tools/addimgid @@ -7,6 +7,7 @@ # OpenPOWER HostBoot Project # # Contributors Listed Below - COPYRIGHT 2011,2017 +# [+] Google Inc. # [+] International Business Machines Corp. # # @@ -35,7 +36,12 @@ my $imgBase = $img; $imgBase =~ s/.*\///; my $PREFIX = $ENV{'CROSS_PREFIX'}; -my $address = hex `${PREFIX}nm $src -C | grep $imageIdSym | colrm 17`; +my $addressStr = `${PREFIX}nm $src -C | grep $imageIdSym | colrm 17`; +if ($addressStr eq '') +{ + exit 0; +} +my $address = hex $addressStr; my $imageId = $ENV{'HOSTBOOT_VERSION'}; if ($imageId eq '') { |
