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

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

Browse source 
* boot/powerpc/ieee1275/cmain.c (cmain): Remove code to parse
	/chosen/bootargs.
	* kern/powerpc/ieee1275/init.c (grub_machine_init): Parse
	/chosen/bootargs as "variable=value" pairs.
This commit is contained in:
hollisb 2005-05-17 02:25:19 +00:00
parent 708b345f74
commit ca5baa3fc2
3 changed files with 45 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-05-10 Hollis Blanchard <hollis@penguinppc.org>
* boot/powerpc/ieee1275/cmain.c (cmain): Remove code to parse
/chosen/bootargs.
* kern/powerpc/ieee1275/init.c (grub_machine_init): Parse
/chosen/bootargs as "variable=value" pairs.
2005-05-08 Vincent Pelletier <subdino2004@yahoo.fr>
* include/grub/misc.h (grub_dprintf): New macro.

69
boot/powerpc/ieee1275/cmain.c
View file

@ -71,15 +71,9 @@ grub_ieee1275_find_options (void)
}
void cmain (uint32_t r3, uint32_t r4, uint32_t r5);
/* Setup the argument vector and pass control over to the main
function. */
void
cmain (uint32_t r3, uint32_t r4 __attribute__((unused)), uint32_t r5)
{
char **argv, args[256];
grub_ieee1275_phandle_t chosen;
int argc = 0, actual;
if (r5 == 0xdeadbeef)
{
/* Entered from Old World stage1. */
@ -106,70 +100,7 @@ cmain (uint32_t r3, uint32_t r4 __attribute__((unused)), uint32_t r5)
grub_ieee1275_find_options ();
/* If any argument was passed to the kernel (us), they are
put in the bootargs property of /chosen. The string can
be null (just the nul-character), so check that the size
is actually greater than one. */
grub_ieee1275_finddevice ("/chosen", &chosen);
if (grub_ieee1275_get_property (chosen, "bootargs", args,
sizeof args, &actual) == 0
&& actual > 1)
{
/* A command line was passed. */
char *str = args;
int nr = 1;
/* First time around we count the number of arguments. */
argc = 2;
while (*str && *str == ' ')
str++;
while (*str)
if (*(str++) == ' ')
{
while (*str && *str == ' ')
str++;
if (*str)
argc++;
}
argv = alloca (sizeof (char *) * (argc + 2));
/* The bootargs property does not contain the program
name, just the arguments. */
argv[0] = "grub";
/* Second time around we fill in the argv. */
str = args;
while (*str && *str == ' ')
str++;
argv[nr++] = str;
while (*str)
{
if (*str == ' ')
{
*(str++) = '\0';
while (*str && *str == ' ')
str++;
if (*str)
argv[nr++] = str;
}
else
str++;
}
argv[nr] = 0;
}
else
{
argv = alloca (sizeof (char *) * 2);
argv[0] = "grub";
argv[1] = 0;
argc = 1;
}
/* Now invoke the main function. */
/* XXX: grub_main does not parse arguments yet. */
grub_main ();
/* Never reached. */

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

@ -113,6 +113,9 @@ grub_set_prefix (void)
void
grub_machine_init (void)
{
char args[256];
grub_ieee1275_phandle_t chosen;
int actual;
extern char _start;
grub_console_init ();
@ -132,6 +135,41 @@ grub_machine_init (void)
grub_set_prefix ();
grub_ofdisk_init ();
/* Process commandline. */
grub_ieee1275_finddevice ("/chosen", &chosen);
if (grub_ieee1275_get_property (chosen, "bootargs", &args,
sizeof args, &actual) == 0
&& actual > 1)
{
int i = 0;
while (i < actual)
{
char *command = &args[i];
char *end;
char *val;
end = grub_strchr (command, ';');
if (end == 0)
i = actual; /* No more commands after this one. */
else
{
*end = '\0';
i += end - command + 1;
while (grub_isspace(args[i]))
i++;
}
/* Process command. */
val = grub_strchr (command, '=');
if (val)
{
*val = '\0';
grub_env_set (command, val + 1);
}
}
}
}
void