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>

authored by Anton Blanchard and committed by Benjamin Herrenschmidt a2dd5da7 bbad3e50

+7 -7
+4 -4
arch/powerpc/boot/main.c
··· 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 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();
+1 -1
arch/powerpc/boot/ops.h
··· 15 15 #include "types.h" 16 16 #include "string.h" 17 17 18 - #define COMMAND_LINE_SIZE 512 18 + #define BOOT_COMMAND_LINE_SIZE 512 19 19 #define MAX_PATH_LEN 256 20 20 #define MAX_PROP_LEN 256 /* What should this be? */ 21 21
+2 -2
arch/powerpc/boot/ps3.c
··· 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