Robert Millan <[EMAIL PROTECTED]> writes: > On Wed, Jan 23, 2008 at 03:05:31PM +0100, Marco Gerards wrote: >> Robert Millan <[EMAIL PROTECTED]> writes: >> >> > Some cleanup for i386-ieee1275. >> >> Can you please give a bit more information? > > The multiboot module on i386-ieee1275 was using variables that only have a > meaning on i386-pc (and i386-linuxbios): grub_os_area_addr, > grub_os_area_size, grub_lower_mem and grub_upper_mem. A bunch of > unnecessary cruft from i386-pc port was being included, because at the > beginning I thought I would base the multiboot loader on i386-pc (like I > did for i386-linuxbios), but this turned out to be a wrong approach.
I see. >> > * include/grub/i386/ieee1275/loader.h: Include `<grub/types.h>', >> > `<grub/symbol.h>' and `<grub/multiboot.h>'. >> > (grub_multiboot2_real_boot): New function prototype. >> > >> > * include/grub/i386/pc/memory.h: Include `<grub/machine/machine.h>'. >> > (grub_lower_mem, grub_upper_mem): Disable for IEEE1275. >> >> You can make this conditional in the ChangeLog entry. > > What do you mean? * include/grub/i386/pc/memory.h: Include `<grub/machine/machine.h>'. [!GRUB_IEEE1275] (grub_lower_mem, grub_upper_mem): Disabled. I didn't check if this is the name of the macro, so please do not blindly copy this. But this is the right approach. -- Marco _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel