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

2005-01-31 Marco Gerards <metgerards@student.han.nl>

Browse source 
* include/grub/powerpc/ieee1275/loader.h (grub_load_linux):
	Removed prototype.
	(grub_rescue_cmd_linux): New prototype.
	(grub_rescue_cmd_initrd): Likewise.
	* powerpc/ieee1275/linux.c (grub_linux_boot): Remove struct
	`bi_rec'.
	(grub_linux_release_mem): Release the memory for the initrd.
	(grub_load_linux): Renamed from this...
	(grub_rescue_cmd_linux): ...To this.  Changed all callers.
	Changed `entry' not to be static.  Loop over memory regions to
	find another one when the default fails.
	(grub_rescue_cmd_initrd): New function.
	(grub_linux_init): Remove function.
	(grub_linux_fini): Likewise.
	(GRUB_MOD_INIT): Register `initrd'.
	(GRUB_MOD_FINI): Unregister `initrd'.
	* powerpc/ieee1275/linux_normal.c (grub_linux_normal_init):
	Function removed.
	(grub_linux_normal_fini): Likewise.
	(GRUB_MOD_INIT): Register `initrd'.
	(GRUB_MOD_FINI): Unregister `initrd'.
This commit is contained in:
marco_g 2005-01-31 21:44:35 +00:00
parent 990cf3aa8a
commit c9f9c5564d
6 changed files with 372 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

28
loader/powerpc/ieee1275/linux_normal.c
View file

@ -31,7 +31,15 @@ static grub_err_t
grub_cmd_linux (struct grub_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
grub_load_linux (argc, args);
grub_rescue_cmd_linux (argc, args);
return GRUB_ERR_NONE;
}
static grub_err_t
grub_cmd_initrd (struct grub_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
grub_rescue_cmd_initrd (argc, args);
return GRUB_ERR_NONE;
}
@ -41,23 +49,13 @@ GRUB_MOD_INIT
grub_register_command ("linux", grub_cmd_linux, GRUB_COMMAND_FLAG_BOTH,
"linux [KERNELARGS...]",
"Loads linux", options);
grub_register_command ("initrd", grub_cmd_initrd, GRUB_COMMAND_FLAG_BOTH,
"initrd FILE",
"Loads initrd", options);
}
GRUB_MOD_FINI
{
grub_unregister_command ("linux");
}
void
grub_linux_normal_init (void)
{
grub_register_command ("linux", grub_cmd_linux, GRUB_COMMAND_FLAG_BOTH,
"linux [KERNELARGS...]",
"Loads linux", options);
}
void
grub_linux_normal_fini (void)
{
grub_unregister_command ("linux");
grub_unregister_command ("initrd");
}