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

2005-01-03 Hollis Blanchard <hollis@penguinppc.org>

Browse source 
* boot/powerpc/ieee1275/cmain.c (grub_ieee1275_realmode): New
	variable.
	(find_options): New function.
	(cmain): Call find_options.
	* include/grub/powerpc/ieee1275/ieee1275.h
	(grub_ieee1275_realmode): New extern variable.
	* kern/powerpc/ieee1275/openfw.c (grub_claimmap): Only call
	grub_map if grub_ieee1275_realmode is false.
This commit is contained in:
hollisb 2005-01-03 17:44:25 +00:00
parent 6b8fd1c428
commit ac507d1ba2
4 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/* openfw.c -- Open firmware support funtions. */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -189,10 +189,13 @@ grub_claimmap (grub_addr_t addr, grub_size_t size)
{
if (grub_ieee1275_claim (addr, size, 0, 0))
return -1;
if (grub_map (addr, addr, size, 0x00))
if ((! grub_ieee1275_realmode) && grub_map (addr, addr, size, 0x00))
{
grub_printf ("map failed: address 0x%x, size 0x%x\n", addr, size);
grub_ieee1275_release (addr, size);
return -1;
}
return 0;
}