Re: common ieee1275 code

[Hollis Blanchard]

On Jul 13, 2005, at 11:13 AM, Marco Gerards wrote:

> Hollis Blanchard <address@hidden> writes:
>
> > This patch is loosely based on Vincent's Sparc patches. It changes the
> > IEEE1275 code to use a new type, grub_ieee1275_cell_t. This is
> > necessary because OpenBoot on Sparc requires the cell size to be 64
> > bits, while Open Firmware on PowerPC requires it to be 32 bits.
>
> Thanks for your patch, it should make things easier for Vincent
> because he has no PPC.  I don't have any problems with this patch.
> Sometimes you include <grub/machine/kernel.h> while it was not
> included before.  Sometimes you add and sometimes you remove
> <grub/ieee1275/ieee1275.h>, I do not understand it.
>
> Please write a changelog so we can apply this ASAP.  I assume there
> were no additional warnings because of this patch.

Oops, fixed. Now the ufs.c warnings are the only warnings present. ;) 
Our build is very verbose; "make 1> /dev/null" is quite useful for 
this.

I did update the patch slightly (attached). If this is acceptable, 
please check in the patch for me, as I will be travelling for a couple 
weeks and it will be difficult to work on GRUB during this time. If it 
is not acceptable, please fix it for me. :)

I will note that one related file is still left: 
kern/powerpc/ieee1275/openfw.c. That file contains some 
PowerPC-specific code, such as grub_map, grub_reboot, and grub_halt. 
However, it also contains code that I think will be generally useful, 
such as device tree path parsing and grub_devalias_iterate. I will 
leave it to others to determine how to split that up.

-Hollis

2005-07-13  Hollis Blanchard  <address@hidden>

        * include/grub/powerpc/ieee1275/ieee1275.h: Move ...
        * include/grub/ieee1275/ieee1275.h: ... to here.  All users 
updated.
        Move `abort', `grub_reboot', and `grub_halt' prototypes ...
        * include/grub/powerpc/ieee1275/kernel.h: ... to here.
        * commands/ieee1275/halt.c: Include <grub/machine/kernel.h> 
instead
        of <grub/machine/ieee1275.h>.
        * commands/ieee1275/reboot.c: Likewise.
        * boot/powerpc/ieee1275/ieee1275.c: Move ...
        * kern/ieee1275.c: ... to here.  All users updated.  Change all
        parameter structs to use new type `grub_ieee1275_cell_t'.
        * term/powerpc/ieee1275/ofconsole.c: Move ...
        * term/ieee1275/ofconsole.c: ... to here.  All users updated.
        * disk/powerpc/ieee1275/ofdisk.c: Move ...
        * disk/ieee1275/ofdisk.c: ... to here.  All users updated.
        * boot/powerpc/ieee1275/cmain.c: Change 
`grub_ieee1275_entry_fn' type
        to return int.
        * include/grub/i386/pc/console.h: Move to 
include/grub/console.h.
        Remove unused prototypes.  All users updated.
        * include/grub/powerpc/ieee1275/console.h: Removed.
        * include/grub/powerpc/ieee1275/ieee1275.h: Define
        `grub_ieee1275_cell_t'.
        * kern/powerpc/ieee1275/openfw.c: Include 
<grub/machine/kernel.h>.
        Cast comparisons with -1 to the correct type.
        * loader/powerpc/ieee1275/linux.c (kernel_entry_t): Change 
parameter
        type to match `grub_ieee1275_entry_fn'.

grub-ieee1275.diff
Description: Binary data