leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc: Rename duplicate COMMAND_LINE_SIZE define

Browse Source 
We have two definitions of COMMAND_LINE_SIZE, one for the kernel
and one for the boot wrapper. I assume this is so the boot
wrapper can be self sufficient and not rely on kernel headers.

Having two defines with the same name is confusing, I just
updated the wrong one when trying to bump it.

Make the boot wrapper define unique by calling it
BOOT_COMMAND_LINE_SIZE.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Anton Blanchard 2014-04-14 21:54:05 +10:00 committed by Benjamin Herrenschmidt
parent bbad3e50e8
commit a2dd5da77f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/boot/main.c
View File

@ -139,18 +139,18 @@ static struct addr_range prep_initrd(struct addr_range vmlinux, void *chosen,
* edit the command line passed to vmlinux (by setting /chosen/bootargs). * edit the command line passed to vmlinux (by setting /chosen/bootargs).
* The buffer is put in it's own section so that tools may locate it easier. * The buffer is put in it's own section so that tools may locate it easier.
*/ */
static char cmdline[COMMAND_LINE_SIZE] static char cmdline[BOOT_COMMAND_LINE_SIZE]
__attribute__((__section__("__builtin_cmdline"))); __attribute__((__section__("__builtin_cmdline")));
static void prep_cmdline(void *chosen) static void prep_cmdline(void *chosen)
{ {
if (cmdline[0] == '\0') if (cmdline[0] == '\0')
getprop(chosen, "bootargs", cmdline, COMMAND_LINE_SIZE-1); getprop(chosen, "bootargs", cmdline, BOOT_COMMAND_LINE_SIZE-1);
printf("\n\rLinux/PowerPC load: %s", cmdline); printf("\n\rLinux/PowerPC load: %s", cmdline);
/* If possible, edit the command line */ /* If possible, edit the command line */
if (console_ops.edit_cmdline) if (console_ops.edit_cmdline)
console_ops.edit_cmdline(cmdline, COMMAND_LINE_SIZE); console_ops.edit_cmdline(cmdline, BOOT_COMMAND_LINE_SIZE);
printf("\n\r"); printf("\n\r");
/* Put the command line back into the devtree for the kernel */ /* Put the command line back into the devtree for the kernel */
@ -174,7 +174,7 @@ void start(void)
* built-in command line wasn't set by an external tool */ * built-in command line wasn't set by an external tool */
if ((loader_info.cmdline_len > 0) && (cmdline[0] == '\0')) if ((loader_info.cmdline_len > 0) && (cmdline[0] == '\0'))
memmove(cmdline, loader_info.cmdline, memmove(cmdline, loader_info.cmdline,
min(loader_info.cmdline_len, COMMAND_LINE_SIZE-1)); min(loader_info.cmdline_len, BOOT_COMMAND_LINE_SIZE-1));
if (console_ops.open && (console_ops.open() < 0)) if (console_ops.open && (console_ops.open() < 0))
exit(); exit();

2
arch/powerpc/boot/ops.h
View File

@ -15,7 +15,7 @@
#include "types.h" #include "types.h"
#include "string.h" #include "string.h"
#define COMMAND_LINE_SIZE 512 #define BOOT_COMMAND_LINE_SIZE 512
#define MAX_PATH_LEN 256 #define MAX_PATH_LEN 256
#define MAX_PROP_LEN 256 /* What should this be? */ #define MAX_PROP_LEN 256 /* What should this be? */

4
arch/powerpc/boot/ps3.c
View File

@ -47,13 +47,13 @@ BSS_STACK(4096);
* The buffer is put in it's own section so that tools may locate it easier. * The buffer is put in it's own section so that tools may locate it easier.
*/ */
static char cmdline[COMMAND_LINE_SIZE] static char cmdline[BOOT_COMMAND_LINE_SIZE]
__attribute__((__section__("__builtin_cmdline"))); __attribute__((__section__("__builtin_cmdline")));
static void prep_cmdline(void *chosen) static void prep_cmdline(void *chosen)
{ {
if (cmdline[0] == '\0') if (cmdline[0] == '\0')
getprop(chosen, "bootargs", cmdline, COMMAND_LINE_SIZE-1); getprop(chosen, "bootargs", cmdline, BOOT_COMMAND_LINE_SIZE-1);
else else
setprop_str(chosen, "bootargs", cmdline); setprop_str(chosen, "bootargs", cmdline);