Commit a2dd5da77f2cc9fc9ff11ea6b699556254e94a6c
Committed by
Benjamin Herrenschmidt
1 parent
bbad3e50e8
Exists in
master
and in
13 other branches
powerpc: Rename duplicate COMMAND_LINE_SIZE define
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>
Showing 3 changed files with 7 additions and 7 deletions Side-by-side Diff
arch/powerpc/boot/main.c
... | ... | @@ -139,18 +139,18 @@ |
139 | 139 | * edit the command line passed to vmlinux (by setting /chosen/bootargs). |
140 | 140 | * The buffer is put in it's own section so that tools may locate it easier. |
141 | 141 | */ |
142 | -static char cmdline[COMMAND_LINE_SIZE] | |
142 | +static char cmdline[BOOT_COMMAND_LINE_SIZE] | |
143 | 143 | __attribute__((__section__("__builtin_cmdline"))); |
144 | 144 | |
145 | 145 | static void prep_cmdline(void *chosen) |
146 | 146 | { |
147 | 147 | if (cmdline[0] == '\0') |
148 | - getprop(chosen, "bootargs", cmdline, COMMAND_LINE_SIZE-1); | |
148 | + getprop(chosen, "bootargs", cmdline, BOOT_COMMAND_LINE_SIZE-1); | |
149 | 149 | |
150 | 150 | printf("\n\rLinux/PowerPC load: %s", cmdline); |
151 | 151 | /* If possible, edit the command line */ |
152 | 152 | if (console_ops.edit_cmdline) |
153 | - console_ops.edit_cmdline(cmdline, COMMAND_LINE_SIZE); | |
153 | + console_ops.edit_cmdline(cmdline, BOOT_COMMAND_LINE_SIZE); | |
154 | 154 | printf("\n\r"); |
155 | 155 | |
156 | 156 | /* Put the command line back into the devtree for the kernel */ |
... | ... | @@ -174,7 +174,7 @@ |
174 | 174 | * built-in command line wasn't set by an external tool */ |
175 | 175 | if ((loader_info.cmdline_len > 0) && (cmdline[0] == '\0')) |
176 | 176 | memmove(cmdline, loader_info.cmdline, |
177 | - min(loader_info.cmdline_len, COMMAND_LINE_SIZE-1)); | |
177 | + min(loader_info.cmdline_len, BOOT_COMMAND_LINE_SIZE-1)); | |
178 | 178 | |
179 | 179 | if (console_ops.open && (console_ops.open() < 0)) |
180 | 180 | exit(); |
arch/powerpc/boot/ops.h
arch/powerpc/boot/ps3.c
... | ... | @@ -47,13 +47,13 @@ |
47 | 47 | * The buffer is put in it's own section so that tools may locate it easier. |
48 | 48 | */ |
49 | 49 | |
50 | -static char cmdline[COMMAND_LINE_SIZE] | |
50 | +static char cmdline[BOOT_COMMAND_LINE_SIZE] | |
51 | 51 | __attribute__((__section__("__builtin_cmdline"))); |
52 | 52 | |
53 | 53 | static void prep_cmdline(void *chosen) |
54 | 54 | { |
55 | 55 | if (cmdline[0] == '\0') |
56 | - getprop(chosen, "bootargs", cmdline, COMMAND_LINE_SIZE-1); | |
56 | + getprop(chosen, "bootargs", cmdline, BOOT_COMMAND_LINE_SIZE-1); | |
57 | 57 | else |
58 | 58 | setprop_str(chosen, "bootargs", cmdline); |
59 | 59 |