Skip to content

Commit

Permalink
bootloader: Remove hbi_ImageId
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
wak-google authored and dcrowell77 committed Jun 25, 2017
1 parent 48715fb commit 951f02c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
6 changes: 1 addition & 5 deletions src/bootloader/bl_start.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2015,2017
# [+] Google Inc.
# [+] International Business Machines Corp.
#
#
Expand Down Expand Up @@ -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
8 changes: 7 additions & 1 deletion src/build/tools/addimgid
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2011,2017
# [+] Google Inc.
# [+] International Business Machines Corp.
#
#
Expand Down Expand Up @@ -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 '')
{
Expand Down

0 comments on commit 951f02c

Please sign in to comment.