Arthur Heymans has submitted this change. ( https://review.coreboot.org/c/coreboot/+/55792 )
Change subject: cbfstool/cbfs-mkstage.c: Change signature of parse_elf_to_xip_stage() ......................................................................
cbfstool/cbfs-mkstage.c: Change signature of parse_elf_to_xip_stage()
The dereferced parameter is never updated so passing a copy would work too.
Change-Id: Ie36f64f55d4fc7034780116c28aaed65aa304d5e Signed-off-by: Arthur Heymans arthur@aheymans.xyz Reviewed-on: https://review.coreboot.org/c/coreboot/+/55792 Reviewed-by: Julius Werner jwerner@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M util/cbfstool/cbfs-mkstage.c M util/cbfstool/cbfstool.c M util/cbfstool/common.h 3 files changed, 4 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified Julius Werner: Looks good to me, approved
diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c index 68eb641..7f4a38b 100644 --- a/util/cbfstool/cbfs-mkstage.c +++ b/util/cbfstool/cbfs-mkstage.c @@ -260,7 +260,7 @@ }
int parse_elf_to_xip_stage(const struct buffer *input, struct buffer *output, - uint32_t *location, const char *ignore_section, + uint32_t location, const char *ignore_section, struct cbfs_file_attr_stageheader *stageheader) { struct xip_context xipctx; @@ -310,7 +310,7 @@
/* Single loadable segment. The entire segment moves to final * location from based on virtual address of loadable segment. */ - adjustment = *location - pelf->phdr->p_vaddr; + adjustment = location - pelf->phdr->p_vaddr; DEBUG("Relocation adjustment: %08x\n", adjustment);
fill_cbfs_stageheader(stageheader, diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 6133536..48c9387 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -1131,7 +1131,7 @@ **/ *offset = convert_addr_space(param.image_region, *offset);
- ret = parse_elf_to_xip_stage(buffer, &output, offset, + ret = parse_elf_to_xip_stage(buffer, &output, *offset, param.ignore_section, stageheader); } else { diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 479fd713..1c25a66 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -178,7 +178,7 @@ struct cbfs_file_attr_stageheader *stageheader); /* location is TOP aligned. */ int parse_elf_to_xip_stage(const struct buffer *input, struct buffer *output, - uint32_t *location, const char *ignore_section, + uint32_t location, const char *ignore_section, struct cbfs_file_attr_stageheader *stageheader);
void print_supported_architectures(void);