From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1I7Elg-0000D5-RW for mharc-grub-devel@gnu.org; Sat, 07 Jul 2007 14:12:28 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1I7Elf-0000Bk-A1 for grub-devel@gnu.org; Sat, 07 Jul 2007 14:12:27 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1I7Elc-0000BU-S3 for grub-devel@gnu.org; Sat, 07 Jul 2007 14:12:25 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I7Elc-0000BR-LV for grub-devel@gnu.org; Sat, 07 Jul 2007 14:12:24 -0400 Received: from mail.freedom.ind.br ([201.35.65.90] helo=freedom.ind.br) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1I7Ela-0002jO-Ni for grub-devel@gnu.org; Sat, 07 Jul 2007 14:12:24 -0400 Received: from freedom.ind.br (localhost [127.0.0.1]) by freedom.ind.br (Postfix) with ESMTP id DA5C611FBEB for ; Sat, 7 Jul 2007 15:12:04 -0300 (BRT) Received: from lab.ossystems.com.br (localhost [127.0.0.1]) by freedom.ind.br (Postfix) with SMTP id 6BE3011F49D for ; Sat, 7 Jul 2007 15:12:02 -0300 (BRT) Received: from 10.1.0.243 ([10.1.0.243] helo=lab.ossystems.com.br) by mail.freedom.ind.br; 7 Jul 2007 15:12:02 -0300 Received: (nullmailer pid 32223 invoked by uid 1000); Sat, 07 Jul 2007 18:12:08 -0000 From: Otavio Salvador To: The development of GRUB 2 Organization: O.S. Systems Ltda. References: <9f50a7a00707070853i459cfe90h7f2c2c51d7123266@mail.gmail.com> X-URL: http://www.debian.org/~otavio/ X-Attribution: O.S. Date: Sat, 07 Jul 2007 15:12:07 -0300 In-Reply-To: <9f50a7a00707070853i459cfe90h7f2c2c51d7123266@mail.gmail.com> (Jerone Young's message of "Sat, 7 Jul 2007 10:53:13 -0500") Message-ID: <87lkdsccco.fsf@lab.ossystems.com.br> User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-kernel: Linux 2.6 (newer, 3) Subject: Re: [RFC] [PATCH] Add multiboot 2 capabilities 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: Sat, 07 Jul 2007 18:12:27 -0000 "Jerone Young" writes: > diff -r b85dfdfcce16 conf/powerpc-ieee1275.rmk > --- a/conf/powerpc-ieee1275.rmk Wed Jul 04 15:53:23 2007 -0500 > +++ b/conf/powerpc-ieee1275.rmk Thu Jul 05 08:04:34 2007 -0500 > @@ -102,7 +102,9 @@ pkgdata_MODULES = halt.mod \ > linux.mod \ > normal.mod \ > reboot.mod \ > - suspend.mod > + suspend.mod \ > + _multiboot.mod \ > + multiboot.mod Badly indented. > # For _linux.mod. > _linux_mod_SOURCES = loader/powerpc/ieee1275/linux.c > @@ -140,5 +142,18 @@ halt_mod_CFLAGS = $(COMMON_CFLAGS) > halt_mod_CFLAGS = $(COMMON_CFLAGS) > halt_mod_LDFLAGS = $(COMMON_LDFLAGS) > > +# For _multiboot.mod > +_multiboot_mod_SOURCES = loader/powerpc/ieee1275/multiboot2.c \ > + loader/multiboot2.c \ > + loader/multiboot_loader.c > +_multiboot_mod_CFLAGS = $(COMMON_CFLAGS) > +_multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS) > + > +# For multiboot.mod > +multiboot_mod_SOURCES = loader/multiboot_loader_normal.c > +multiboot_mod_CFLAGS = $(COMMON_CFLAGS) > +multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS) > + > + > include $(srcdir)/conf/common.mk > > diff -r b85dfdfcce16 include/grub/i386/pc/loader.h > --- a/include/grub/i386/pc/loader.h Wed Jul 04 15:53:23 2007 -0500 > +++ b/include/grub/i386/pc/loader.h Thu Jul 05 01:17:47 2007 -0500 > @@ -22,11 +22,13 @@ <...> > void EXPORT_FUNC(grub_linux_boot_zimage) (void) __attribute__ ((noreturn)); > void EXPORT_FUNC(grub_linux_boot_bzimage) (void) __attribute__ ((noreturn)); > @@ -34,16 +36,18 @@ void EXPORT_FUNC(grub_linux_boot_bzimage > /* This is an asm part of the chainloader. */ > void EXPORT_FUNC(grub_chainloader_real_boot) (int drive, void *part_addr) __attribute__ ((noreturn)); > > + Useless change. > /* The asm part of the multiboot loader. */ > void EXPORT_FUNC(grub_multiboot_real_boot) (grub_addr_t entry, > struct grub_multiboot_info *mbi) > + __attribute__ ((noreturn)); > +void EXPORT_FUNC(grub_multiboot2_real_boot) (grub_addr_t entry, > + struct grub_multiboot_info *mbi) > __attribute__ ((noreturn)); Use same codestyle, please. There are some other places where it's not following same codestyle and would be nice if it could be fixed, imho. Kind regards, -- O T A V I O S A L V A D O R --------------------------------------------- E-mail: otavio@debian.org UIN: 5906116 GNU/Linux User: 239058 GPG ID: 49A5F855 Home Page: http://otavio.ossystems.com.br --------------------------------------------- "Microsoft sells you Windows ... Linux gives you the whole house."