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

2009-06-22 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* conf/i386-pc.rmk (GRUB_MEMORY_MACHINE_LINK_ADDR): Rename to ...
        (GRUB_KERNEL_MACHINE_LINK_ADDR): ... this.  Update all users.
This commit is contained in:
robertmh 2009-06-22 19:23:22 +00:00
parent 387a140ce6
commit 132a0a595f
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
util/i386/pc/grub-mkimage.c
View file

@ -270,9 +270,9 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
= grub_cpu_to_le32 (-2);
}
if (GRUB_MEMORY_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_MACHINE_UPPER)
if (GRUB_KERNEL_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_MACHINE_UPPER)
grub_util_error ("Core image is too big (%p > %p)\n",
GRUB_MEMORY_MACHINE_LINK_ADDR + core_size, GRUB_MEMORY_MACHINE_UPPER);
GRUB_KERNEL_MACHINE_LINK_ADDR + core_size, GRUB_MEMORY_MACHINE_UPPER);
grub_util_write_image (core_img, core_size, out);
free (kernel_img);