aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorMike Frysinger <michael.frysinger@analog.com>2007-06-11 04:44:09 -0400
committerBryan Wu <bryan.wu@analog.com>2007-06-11 04:44:09 -0400
commit5e10b4a653b9c7942fd1044fe5b592d544736897 (patch)
tree3fd71ab9fb2f4a92cc63c8545e11d63c8a20b147 /arch/blackfin
parentfd92348e520af92ddd48b8100cd0ccb16a055ed3 (diff)
Blackfin arch: add support for Alon Bar-Lev's dynamic kernel command-line
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/kernel/setup.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 0ba5f4a1786c..a24fa1ab802b 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -61,7 +61,7 @@ EXPORT_SYMBOL(memory_mtd_start);
61EXPORT_SYMBOL(mtd_size); 61EXPORT_SYMBOL(mtd_size);
62#endif 62#endif
63 63
64char command_line[COMMAND_LINE_SIZE]; 64char __initdata command_line[COMMAND_LINE_SIZE];
65 65
66#if defined(CONFIG_BLKFIN_DCACHE) || defined(CONFIG_BLKFIN_CACHE) 66#if defined(CONFIG_BLKFIN_DCACHE) || defined(CONFIG_BLKFIN_CACHE)
67static void generate_cpl_tables(void); 67static void generate_cpl_tables(void);
@@ -205,7 +205,6 @@ void __init setup_arch(char **cmdline_p)
205#endif 205#endif
206 206
207#if defined(CONFIG_CMDLINE_BOOL) 207#if defined(CONFIG_CMDLINE_BOOL)
208 memset(command_line, 0, sizeof(command_line));
209 strncpy(&command_line[0], CONFIG_CMDLINE, sizeof(command_line)); 208 strncpy(&command_line[0], CONFIG_CMDLINE, sizeof(command_line));
210 command_line[sizeof(command_line) - 1] = 0; 209 command_line[sizeof(command_line) - 1] = 0;
211#endif 210#endif
@@ -213,7 +212,7 @@ void __init setup_arch(char **cmdline_p)
213 /* Keep a copy of command line */ 212 /* Keep a copy of command line */
214 *cmdline_p = &command_line[0]; 213 *cmdline_p = &command_line[0];
215 memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE); 214 memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
216 boot_command_line[COMMAND_LINE_SIZE - 1] = 0; 215 boot_command_line[COMMAND_LINE_SIZE - 1] = '\0';
217 216
218 /* setup memory defaults from the user config */ 217 /* setup memory defaults from the user config */
219 physical_mem_end = 0; 218 physical_mem_end = 0;
@@ -898,7 +897,7 @@ struct seq_operations cpuinfo_op = {
898 .show = show_cpuinfo, 897 .show = show_cpuinfo,
899}; 898};
900 899
901void __init cmdline_init(char *r0) 900void __init cmdline_init(const char *r0)
902{ 901{
903 if (r0) 902 if (r0)
904 strncpy(command_line, r0, COMMAND_LINE_SIZE); 903 strncpy(command_line, r0, COMMAND_LINE_SIZE);