Skip to content

Commit

Permalink
m68k: support configure time command line for MMU m68k
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Ungerer committed Dec 24, 2011
1 parent e87c09a commit d1db912
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
16 changes: 8 additions & 8 deletions arch/m68k/Kconfig.debug
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ menu "Kernel hacking"

source "lib/Kconfig.debug"

config BOOTPARAM
bool 'Compiled-in Kernel Boot Parameter'

config BOOTPARAM_STRING
string 'Kernel Boot Parameter'
default 'console=ttyS0,19200'
depends on BOOTPARAM

if !MMU

config FULLDEBUG
Expand All @@ -15,14 +23,6 @@ config HIGHPROFILE
help
Use a fast secondary clock to produce profiling information.

config BOOTPARAM
bool 'Compiled-in Kernel Boot Parameter'

config BOOTPARAM_STRING
string 'Kernel Boot Parameter'
default 'console=ttyS0,19200'
depends on BOOTPARAM

config NO_KERNEL_MSG
bool "Suppress Kernel BUG Messages"
help
Expand Down
4 changes: 4 additions & 0 deletions arch/m68k/kernel/setup_mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit d1db912

Please sign in to comment.