"Jerone Young" <[EMAIL PROTECTED]> 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: [EMAIL PROTECTED] 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." _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel