From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JJWt3-00083j-CC for mharc-grub-devel@gnu.org; Mon, 28 Jan 2008 11:31:09 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JJWt2-00083e-0y for grub-devel@gnu.org; Mon, 28 Jan 2008 11:31:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JJWsz-00083S-DV for grub-devel@gnu.org; Mon, 28 Jan 2008 11:31:06 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JJWsz-00083P-A2 for grub-devel@gnu.org; Mon, 28 Jan 2008 11:31:05 -0500 Received: from aybabtu.com ([69.60.117.155]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JJWsz-0000Bv-7T for grub-devel@gnu.org; Mon, 28 Jan 2008 11:31:05 -0500 Received: from [192.168.10.6] (helo=thorin) by aybabtu.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1JJWsn-000819-Li for grub-devel@gnu.org; Mon, 28 Jan 2008 17:30:57 +0100 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1JJWqy-00044S-G0 for grub-devel@gnu.org; Mon, 28 Jan 2008 17:29:00 +0100 Date: Mon, 28 Jan 2008 17:29:00 +0100 From: Robert Millan To: The development of GRUB 2 Message-ID: <20080128162900.GA9715@thorin> References: <1201490732.20392.15.camel@rd> <20080128090910.GC13368@thorin> <20080128093028.GA29689@thorin> <1201527891.15848.6.camel@dv> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="5vNYLRcllDrimb99" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1201527891.15848.6.camel@dv> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.13 (2006-08-11) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: Re: GRUB_MOD_GAP for non-ieee1275 ELF platforms X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 16:31:08 -0000 --5vNYLRcllDrimb99 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit 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 I know my rights; I want my phone call! What use is a phone call… if you are unable to speak? (as seen on /.) --5vNYLRcllDrimb99 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="tmp.diff" 2008-01-27 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. 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); --5vNYLRcllDrimb99--