On Mon, Jan 28, 2008 at 08:44:51AM -0500, Pavel Roskin wrote:
> > What do you suggest?
>
> I would prefer to have GRUB_MOD_GAP is all headers. Once it's not
> needed, it could be removed across the board.
Ok, does this seem fine?
--
Robert Millan
<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)
2008-01-27 Robert Millan <[EMAIL PROTECTED]>
* 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.
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/include/grub/i386/linuxbios/kernel.h ./include/grub/i386/linuxbios/kernel.h
--- ../grub2/include/grub/i386/linuxbios/kernel.h 2007-10-31 23:35:12.000000000 +0100
+++ ./include/grub/i386/linuxbios/kernel.h 2008-01-28 17:25:50.000000000 +0100
@@ -1,6 +1,6 @@
/*
* 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
* it under the terms of the GNU General Public License as published by
@@ -23,4 +23,7 @@
#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 */
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/kern/powerpc/ieee1275/init.c ./kern/powerpc/ieee1275/init.c
--- ../grub2/kern/powerpc/ieee1275/init.c 2008-01-28 00:11:01.000000000 +0100
+++ ./kern/powerpc/ieee1275/init.c 2008-01-28 17:23:11.000000000 +0100
@@ -242,10 +242,5 @@ grub_get_rtc (void)
grub_addr_t
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);
}
diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/util/elf/grub-mkimage.c ./util/elf/grub-mkimage.c
--- ../grub2/util/elf/grub-mkimage.c 2008-01-28 10:01:11.000000000 +0100
+++ ./util/elf/grub-mkimage.c 2008-01-28 17:24:32.000000000 +0100
@@ -1,6 +1,6 @@
/*
* 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
* it under the terms of the GNU General Public License as published by
@@ -217,11 +217,6 @@ add_segments (char *dir, FILE *out, int
{
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. */
modbase = ALIGN_UP(grub_end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);
_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel
