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

cbfstool: Read XIP stage alignment requirements from ELF

Browse Source 
On x86_64 romstage can contain page tables and a page table pointer
which have an larger alignment requirement of 4096. Instead of
hardcoding it, read if from the ELF phdrs.

Change-Id: I94e4a4209b7441ecb2966a1342c3d46625771bb8
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/82102
Reviewed-by: Shuo Liu <shuo.liu@intel.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jérémy Compostella <jeremy.compostella@intel.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Arthur Heymans
2024-04-29 10:04:59 +02:00
committed by Julius Werner
parent 71c9010443
commit 6ed0ba1e93
4 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
util/cbfstool/elfheaders.c
View File

@ -1434,12 +1434,13 @@ int elf_writer_add_rel(struct elf_writer *ew, const char *sym, Elf64_Addr addr)
return add_rel(rel_sec, &rel);
}
int elf_program_file_size(const struct buffer *input, size_t *file_size)
int elf_program_file_size_align(const struct buffer *input, size_t *file_size, size_t *align)
{
Elf64_Ehdr ehdr;
Elf64_Phdr *phdr;
int i;
size_t loadable_file_size = 0;
size_t align_size = 0;
if (elf_headers(input, &ehdr, &phdr, NULL))
return -1;
@ -1448,9 +1449,11 @@ int elf_program_file_size(const struct buffer *input, size_t *file_size)
if (phdr[i].p_type != PT_LOAD)
continue;
loadable_file_size += phdr[i].p_filesz;
align_size = MAX(align_size, phdr[i].p_align);
}
*file_size = loadable_file_size;
*align = align_size;
free(phdr);