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

2008-01-28 Robert Millan <rmh@aybabtu.com>

Browse source 
* include/grub/i386/linuxbios/kernel.h (GRUB_MOD_GAP): New macro.
        * kern/powerpc/ieee1275/init.c (grub_arch_modules_addr): Remove
        `ifndef GRUB_MOD_GAP' hack.
        * util/elf/grub-mkimage.c (add_segments): Likewise.
This commit is contained in:
robertmh 2008-01-28 16:58:13 +00:00
parent 962ca13330
commit 11cc30ac40
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-01-28 Robert Millan <rmh@aybabtu.com>
* include/grub/i386/linuxbios/kernel.h (GRUB_MOD_GAP): New macro.
* kern/powerpc/ieee1275/init.c (grub_arch_modules_addr): Remove
`ifndef GRUB_MOD_GAP' hack.
* util/elf/grub-mkimage.c (add_segments): Likewise.
2008-01-27 Robert Millan <rmh@aybabtu.com> 2008-01-27 Robert Millan <rmh@aybabtu.com>
* kern/powerpc/ieee1275/init.c (grub_arch_modules_addr): Skip * kern/powerpc/ieee1275/init.c (grub_arch_modules_addr): Skip

5
include/grub/i386/linuxbios/kernel.h
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2005,2006,2007 Free Software Foundation, Inc. * Copyright (C) 2005,2006,2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -23,4 +23,7 @@
#define GRUB_MOD_ALIGN 0x1000 #define GRUB_MOD_ALIGN 0x1000
/* Non-zero value is only needed for some IEEE-1275 platforms. */
#define GRUB_MOD_GAP 0
#endif /* ! GRUB_KERNEL_MACHINE_HEADER */ #endif /* ! GRUB_KERNEL_MACHINE_HEADER */

5
kern/powerpc/ieee1275/init.c
View file

@ -242,10 +242,5 @@ grub_get_rtc (void)
grub_addr_t grub_addr_t
grub_arch_modules_addr (void) grub_arch_modules_addr (void)
{ {
/* Only needed for Apple hardware (therefore, powerpc). */
#ifndef GRUB_MOD_GAP
#define GRUB_MOD_GAP 0
#endif
return ALIGN_UP(_end + GRUB_MOD_GAP, GRUB_MOD_ALIGN); return ALIGN_UP(_end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);
} }

7
util/elf/grub-mkimage.c
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2004,2005,2006,2007 Free Software Foundation, Inc. * Copyright (C) 2004,2005,2006,2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -217,11 +217,6 @@ add_segments (char *dir, FILE *out, int chrp, char *mods[])
{ {
grub_addr_t modbase; grub_addr_t modbase;
/* Only needed for Apple hardware (therefore, powerpc). */
#ifndef GRUB_MOD_GAP
#define GRUB_MOD_GAP 0
#endif
/* Place modules just after grub segment. */ /* Place modules just after grub segment. */
modbase = ALIGN_UP(grub_end + GRUB_MOD_GAP, GRUB_MOD_ALIGN); modbase = ALIGN_UP(grub_end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);