sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfstool/cbfs-mkstage.c: Change signature of parse_elf_to_xip_stage()

Browse Source 
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>
This commit is contained in:
Arthur Heymans
2021-06-22 15:21:46 +02:00
parent d9b714dada
commit 5bb7dc4e05
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/cbfstool/cbfs-mkstage.c
View File

@@ -260,7 +260,7 @@ static int rmod_filter(struct reloc_filter *f, const Elf64_Rela *r)
} }
int parse_elf_to_xip_stage(const struct buffer *input, struct buffer *output, 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 cbfs_file_attr_stageheader *stageheader)
{ {
struct xip_context xipctx; struct xip_context xipctx;
@@ -310,7 +310,7 @@ int parse_elf_to_xip_stage(const struct buffer *input, struct buffer *output,
/* Single loadable segment. The entire segment moves to final /* Single loadable segment. The entire segment moves to final
* location from based on virtual address of loadable segment. */ * 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); DEBUG("Relocation adjustment: %08x\n", adjustment);
fill_cbfs_stageheader(stageheader, fill_cbfs_stageheader(stageheader,

2
util/cbfstool/cbfstool.c
View File

@@ -1131,7 +1131,7 @@ static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset,
**/ **/
*offset = convert_addr_space(param.image_region, *offset); *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, param.ignore_section,
stageheader); stageheader);
} else { } else {

2
util/cbfstool/common.h
View File

@@ -178,7 +178,7 @@ int parse_elf_to_stage(const struct buffer *input, struct buffer *output,
struct cbfs_file_attr_stageheader *stageheader); struct cbfs_file_attr_stageheader *stageheader);
/* location is TOP aligned. */ /* location is TOP aligned. */
int parse_elf_to_xip_stage(const struct buffer *input, struct buffer *output, 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 cbfs_file_attr_stageheader *stageheader);
void print_supported_architectures(void); void print_supported_architectures(void);