summaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-10-19 03:46:03 +0200
committerGreg Ungerer <gerg@uclinux.org>2011-12-24 12:47:57 +0100
commitd1db9120cd7df0872385fd29a25257f23cb70527 (patch)
treebc412f63e47e5e19724b4beb87345e8b647a2d69 /arch/m68k/kernel
parentm68k: print memory layout info in boot log (diff)
downloadlinux-d1db9120cd7df0872385fd29a25257f23cb70527.tar.xz
linux-d1db9120cd7df0872385fd29a25257f23cb70527.zip
m68k: support configure time command line for MMU m68k
The non-MMU builds of m68k allow a fixed kernel boot command line to be configured at configure time. Allow this MMU builds as well. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r--arch/m68k/kernel/setup_mm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index c3b45061dd08..55f8f5049f68 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -258,6 +258,10 @@ void __init setup_arch(char **cmdline_p)
init_mm.end_data = (unsigned long)_edata;
init_mm.brk = (unsigned long)_end;
+#if defined(CONFIG_BOOTPARAM)
+ strncpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE);
+ m68k_command_line[CL_SIZE - 1] = 0;
+#endif /* CONFIG_BOOTPARAM */
*cmdline_p = m68k_command_line;
memcpy(boot_command_line, *cmdline_p, CL_SIZE);