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

2005-11-22 Mike Small <smallm@panix.com>

Browse source 
* util/powerpc/ieee1275/grub-install.in (grubdir): Fixed partition
	number regex so multidigit numbers are recognized correctly.

	* loader/powerpc/ieee1275/linux.c (grub_rescue_cmd_linux): Add a
	debugging message before attempting to claim memory.
	(grub_rescue_cmd_initrd): Add a claim debugging message and try
	multiple addresses in case of failure.
This commit is contained in:
hollisb 2005-11-23 04:25:16 +00:00
parent 9c12956b84
commit 44b83271e6
5 changed files with 77 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -173,6 +173,8 @@ grub_rescue_cmd_linux (int argc, char *argv[])
try some other addresses just like yaboot does. */
for (linux_addr = entry; linux_addr < entry + 200 * 0x100000; linux_addr += 0x100000)
{
grub_dprintf ("loader", "Attempting to claim at 0x%x, size 0x%x.\n",
linux_addr, linux_size);
found_addr = grub_claimmap (linux_addr, linux_size);
if (found_addr != -1)
break;
@ -261,7 +263,9 @@ grub_rescue_cmd_initrd (int argc, char *argv[])
{
grub_file_t file = 0;
grub_ssize_t size;
grub_addr_t first_addr;
grub_addr_t addr;
int found_addr = 0;
if (argc == 0)
{
@ -279,10 +283,21 @@ grub_rescue_cmd_initrd (int argc, char *argv[])
if (! file)
goto fail;
addr = linux_addr + linux_size;
first_addr = linux_addr + linux_size;
size = grub_file_size (file);
if (grub_claimmap (addr, size) == -1)
/* Attempt to claim at a series of addresses until successful in
the same way that grub_rescue_cmd_linux does. */
for (addr = first_addr; addr < first_addr + 200 * 0x100000; addr += 0x100000)
{
grub_dprintf ("loader", "Attempting to claim at 0x%x, size 0x%x.\n",
addr, size);
found_addr = grub_claimmap (addr, size);
if (found_addr != -1)
break;
}
if (found_addr == -1)
{
grub_error (GRUB_ERR_OUT_OF_MEMORY, "Can not claim memory");
goto fail;