diff options
| author | William A. Kennington III <wak@google.com> | 2017-05-09 15:35:01 -0700 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-25 17:51:52 -0400 |
| commit | 951f02c32769c3001895abe625976f2a2b72688e (patch) | |
| tree | cfd3513b1dbfdba12a029b13848bcc2b1fb9a4aa /src | |
| parent | 48715fb712512944aae0bd4154defab65d30dc12 (diff) | |
| download | talos-hostboot-951f02c32769c3001895abe625976f2a2b72688e.tar.gz talos-hostboot-951f02c32769c3001895abe625976f2a2b72688e.zip | |
bootloader: Remove hbi_ImageId
None of the bootloader code references the hbi_ImageId but it is
included anyway. If the version string is changed in the build sequence
this results in a new hbbl.bin image. When booting with this new image,
an SBE update will be triggered since the hbbl.bin is different than the
one in the on chip SBE.
Resolves #102
Signed-off-by: William A. Kennington III <wak@google.com>
Change-Id: I5c19408473bb68ee89ef864517b6964844aad9bd
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40822
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
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: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -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 '') { |
