From 11cc30ac40ac615a0b238ce2dad7ce42d355ecd0 Mon Sep 17 00:00:00 2001 From: robertmh Date: Mon, 28 Jan 2008 16:58:13 +0000 Subject: [PATCH] 2008-01-28 Robert Millan * 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. --- ChangeLog | 7 +++++++ include/grub/i386/linuxbios/kernel.h | 5 ++++- kern/powerpc/ieee1275/init.c | 5 ----- util/elf/grub-mkimage.c | 7 +------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index beb6aeddb..ae4ba128f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-28 Robert Millan + + * 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 * kern/powerpc/ieee1275/init.c (grub_arch_modules_addr): Skip diff --git a/include/grub/i386/linuxbios/kernel.h b/include/grub/i386/linuxbios/kernel.h index 9f0ccdd5e..480d8727d 100644 --- a/include/grub/i386/linuxbios/kernel.h +++ b/include/grub/i386/linuxbios/kernel.h @@ -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 --git a/kern/powerpc/ieee1275/init.c b/kern/powerpc/ieee1275/init.c index b86e4f5c1..6d08140f0 100644 --- a/kern/powerpc/ieee1275/init.c +++ b/kern/powerpc/ieee1275/init.c @@ -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 --git a/util/elf/grub-mkimage.c b/util/elf/grub-mkimage.c index 8afde7985..ca138dd5d 100644 --- a/util/elf/grub-mkimage.c +++ b/util/elf/grub-mkimage.c @@ -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 chrp, char *mods[]) { 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);