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

2004-10-28 Hollis Blanchard <hollis@penguinppc.org>

Browse source 
* boot/powerpc/ieee1275/cmain.c (cmain): Remove asm statements
	which initialized BAT registers.
	* boot/powerpc/ieee1275/ieee1275.c (IEEE1275_CALL_ENTRY_FN,
	grub_ieee1275_common_hdr, INIT_IEEE1275_COMMON):
	Move from here...
	* include/grub/powerpc/ieee1275/ieee1275.h (IEEE1275_CALL_ENTRY_FN,
	grub_ieee1275_common_hdr, INIT_IEEE1275_COMMON):
	... to here.
	* kern/powerpc/ieee1275/openfw.c (grub_map): New function.
	(grub_mapclaim): Likewise.
	* loader/powerpc/ieee1275/linux.c (grub_load_linux): Use
	grub_mapclaim instead of grub_ieee1275_claim.  Assign linux_addr by
	hand.
This commit is contained in:
hollisb 2004-10-29 02:45:14 +00:00
parent 9304c1f804
commit a5477a5930
6 changed files with 95 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

5
loader/powerpc/ieee1275/linux.c
View file

@ -188,12 +188,13 @@ grub_load_linux (int argc, char *argv[])
/* Reserve memory for the kernel. */
linux_size += 0x100000;
if (grub_ieee1275_claim (entry, linux_size, 0, &linux_addr) == -1)
if (grub_claimmap (entry, linux_size) == -1)
{
grub_error (GRUB_ERR_OUT_OF_MEMORY, "Can not claim memory");
goto fail;
}
linux_addr = entry;
/* Load every loadable segment in memory. */
for (i = 0; i < ehdr.e_phnum; i++)
{