vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-mkimagexx.c (generate_elf): Fix module address on coreboot.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-11-10 19:34:19 +01:00
parent 2024ade285
commit 881c6a1049
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-11-10 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkimagexx.c (generate_elf): Fix module address on coreboot.
2013-11-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/ieee1275/escc.c (GRUB_MOD_INIT): Fix order of channels.

9
util/grub-mkimagexx.c
View file

@ -171,9 +171,12 @@ SUFFIX (generate_elf) (const struct grub_install_image_target_desc *image_target
phdr->p_filesz = phdr->p_memsz
= grub_host_to_target32 (*core_size - kernel_size);
target_addr_mods = ALIGN_UP (target_addr + kernel_size + bss_size
+ image_target->mod_gap,
image_target->mod_align);
if (image_target->id == IMAGE_COREBOOT)
target_addr_mods = GRUB_KERNEL_I386_COREBOOT_MODULES_ADDR;
else
target_addr_mods = ALIGN_UP (target_addr + kernel_size + bss_size
+ image_target->mod_gap,
image_target->mod_align);
phdr->p_vaddr = grub_host_to_target_addr (target_addr_mods);
phdr->p_paddr = grub_host_to_target_addr (target_addr_mods);
phdr->p_align = grub_host_to_target32 (image_target->link_align);