Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-25 08:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

coreboot

Browse Source
This commit is contained in:
Vladimir Serbinenko committed 2016-02-21 18:59:14 +01:00
1 parent dc51ac70ee
commit f900bea454
1 file changed
+8 -1
Download Patch File Download Diff File Expand all files Collapse all files
util/grub-mkimagexx.c
+8 -1
View File
@@ -285,7 +285,10 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
{ {
grub_uint32_t target_addr_mods; grub_uint32_t target_addr_mods;
phdr->p_filesz = grub_host_to_target32 (layout->kernel_size); phdr->p_filesz = grub_host_to_target32 (layout->kernel_size);
phdr->p_memsz = grub_host_to_target32 (layout->kernel_size + layout->bss_size); if (image_target->id == IMAGE_COREBOOT && image_target->elf_target == EM_ARM)
phdr->p_memsz = grub_host_to_target32 (layout->kernel_size);
else
phdr->p_memsz = grub_host_to_target32 (layout->kernel_size + layout->bss_size);
phdr++; phdr++;
phdr->p_type = grub_host_to_target32 (PT_GNU_STACK); phdr->p_type = grub_host_to_target32 (PT_GNU_STACK);
@@ -303,6 +306,10 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
if (image_target->id == IMAGE_COREBOOT && image_target->elf_target == EM_386) if (image_target->id == IMAGE_COREBOOT && image_target->elf_target == EM_386)
target_addr_mods = GRUB_KERNEL_I386_COREBOOT_MODULES_ADDR; target_addr_mods = GRUB_KERNEL_I386_COREBOOT_MODULES_ADDR;
else if (image_target->id == IMAGE_COREBOOT && image_target->elf_target == EM_ARM)
target_addr_mods = ALIGN_UP (target_addr + layout->end
+ image_target->mod_gap,
image_target->mod_align);
else else
target_addr_mods = ALIGN_UP (target_addr + layout->kernel_size + layout->bss_size target_addr_mods = ALIGN_UP (target_addr + layout->kernel_size + layout->bss_size
+ image_target->mod_gap, + image_target->mod_gap,