GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-22 07:01:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

MIPS: bootm.c: make checkpatch.pl clean

Browse source 
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
This commit is contained in:
Daniel Schwierzeck 2012-06-03 23:46:04 +02:00
parent 4398d55991
commit e51a6b7a6c
1 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
arch/mips/lib/bootm.c
View file

@ -43,7 +43,8 @@ static int linux_env_idx;
static void linux_params_init(ulong start, char *commandline); static void linux_params_init(ulong start, char *commandline);
static void linux_env_set(char *env_name, char *env_val); static void linux_env_set(char *env_name, char *env_val);
int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images) int do_bootm_linux(int flag, int argc, char * const argv[],
bootm_headers_t *images)
{ {
void (*theKernel) (int, char **, char **, int *); void (*theKernel) (int, char **, char **, int *);
char *commandline = getenv("bootargs"); char *commandline = getenv("bootargs");
@ -70,7 +71,8 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
debug("## Giving linux memsize in bytes, %lu\n", (ulong)gd->ram_size); debug("## Giving linux memsize in bytes, %lu\n", (ulong)gd->ram_size);
#else #else
sprintf(env_buf, "%lu", (ulong)(gd->ram_size >> 20)); sprintf(env_buf, "%lu", (ulong)(gd->ram_size >> 20));
debug ("## Giving linux memsize in MB, %lu\n", (ulong)(gd->ram_size >> 20)); debug("## Giving linux memsize in MB, %lu\n",
(ulong)(gd->ram_size >> 20));
#endif /* CONFIG_MEMSIZE_IN_BYTES */ #endif /* CONFIG_MEMSIZE_IN_BYTES */
linux_env_set("memsize", env_buf); linux_env_set("memsize", env_buf);
@ -88,19 +90,18 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
linux_env_set("flash_size", env_buf); linux_env_set("flash_size", env_buf);
cp = getenv("ethaddr"); cp = getenv("ethaddr");
if (cp != NULL) { if (cp)
linux_env_set("ethaddr", cp); linux_env_set("ethaddr", cp);
}
cp = getenv("eth1addr"); cp = getenv("eth1addr");
if (cp != NULL) { if (cp)
linux_env_set("eth1addr", cp); linux_env_set("eth1addr", cp);
}
/* we assume that the kernel is in place */ /* we assume that the kernel is in place */
printf("\nStarting kernel ...\n\n"); printf("\nStarting kernel ...\n\n");
theKernel(linux_argc, linux_argv, linux_env, 0); theKernel(linux_argc, linux_argv, linux_env, 0);
/* does not return */ /* does not return */
return 1; return 1;
} }
@ -120,20 +121,19 @@ static void linux_params_init (ulong start, char *line)
quote = strchr(line, '"'); quote = strchr(line, '"');
next = strchr(line, ' '); next = strchr(line, ' ');
while (next != NULL && quote != NULL && quote < next) { while (next && quote && quote < next) {
/* we found a left quote before the next blank /* we found a left quote before the next blank
* now we have to find the matching right quote * now we have to find the matching right quote
*/ */
next = strchr(quote + 1, '"'); next = strchr(quote + 1, '"');
if (next != NULL) { if (next) {
quote = strchr(next + 1, '"'); quote = strchr(next + 1, '"');
next = strchr(next + 1, ' '); next = strchr(next + 1, ' ');
} }
} }
if (next == NULL) { if (!next)
next = line + strlen(line); next = line + strlen(line);
}
linux_argv[linux_argc] = argp; linux_argv[linux_argc] = argp;
memcpy(argp, line, next - line); memcpy(argp, line, next - line);