vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2005-05-08 Hollis Blanchard <hollis@penguinppc.org>

Browse source 
* boot/powerpc/ieee1275/cmain.c	(module_info): Remove definition.
	(grub_ieee1275_chosen): New variable.
	(cmain): Initialize and use `grub_ieee1275_chosen' instead of
	`chosen'.
	* boot/powerpc/ieee1275/crt0.S (init_stack): Remove stack space.
	* boot/powerpc/ieee1275/ieee1275.c (grub_ieee1275_get_property):
	Rename first argument to `phandle' for consistency.
	(grub_ieee1275_get_property_length): Likewise.
	(grub_ieee1275_next_property): Likewise.  Change type of first argument
	to grub_ieee1275_phandle_t.
	* include/grub/powerpc/ieee1275/ieee1275.h (grub_ieee1275_entry_fn):
	Move export next to declaration.
	(grub_ieee1275_chosen): New variable.
	* include/grub/powerpc/ieee1275/kernel.h (GRUB_IEEE1275_MODULE_BASE):
	Correct cosmetic typo.
	* kern/powerpc/ieee1275/init.c (grub_set_prefix): Use
	`grub_ieee1275_chosen'.
	* kern/powerpc/ieee1275/openfw.c (grub_map): Likewise.
	* loader/powerpc/ieee1275/linux.c (grub_linux_boot): Likewise.
	(grub_rescue_cmd_linux): Set `initrd_addr' to 0.
	* term/powerpc/ieee1275/ofconsole.c (grub_ofconsole_refresh): Use
	`grub_ieee1275_chosen'.
This commit is contained in:
hollisb 2005-06-21 02:33:52 +00:00
parent ca5baa3fc2
commit 168d6e5810
10 changed files with 47 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kern/powerpc/ieee1275/init.c
View file

@ -68,10 +68,8 @@ grub_set_prefix (void)
char bootpath[64]; /* XXX check length */
char *filename;
char *prefix;
grub_ieee1275_phandle_t chosen;
grub_ieee1275_finddevice ("/chosen", &chosen);
if (grub_ieee1275_get_property (chosen, "bootpath", &bootpath,
if (grub_ieee1275_get_property (grub_ieee1275_chosen, "bootpath", &bootpath,
sizeof (bootpath), 0))
{
/* Should never happen. */

8
kern/powerpc/ieee1275/openfw.c
View file

@ -165,14 +165,10 @@ grub_map (grub_addr_t phys, grub_addr_t virt, grub_uint32_t size,
int catch_result;
} args;
grub_ieee1275_ihandle_t mmu;
grub_ieee1275_ihandle_t chosen;
int len;
grub_ieee1275_finddevice ("/chosen", &chosen);
if (chosen == 0)
return -1;
grub_ieee1275_get_property (chosen, "mmu", &mmu, sizeof mmu, &len);
grub_ieee1275_get_property (grub_ieee1275_chosen, "mmu", &mmu, sizeof mmu,
&len);
if (len != sizeof mmu)
return -1;