diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2007-05-01 22:32:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 17:59:06 -0700 |
| commit | d6713b4091a99fa2af2fabdcd2f3fb97f32ecf2e (patch) | |
| tree | 7cabd0ff35f9ec4413ba936ddb203d13dffb1550 /arch/m68k/kernel | |
| parent | f8744bc95dac461cef40df7143756d1bfa393991 (diff) | |
m68k: early parameter support
Add early parameter support and convert current users to it.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/setup.c | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index 852cefe7c80..9b307a5f4f2 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c @@ -71,9 +71,6 @@ static struct mem_info m68k_ramdisk; static char m68k_command_line[CL_SIZE]; -char m68k_debug_device[6] = ""; -EXPORT_SYMBOL(m68k_debug_device); - void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL; /* machine dependent irq functions */ void (*mach_init_IRQ) (void) __initdata = NULL; @@ -215,7 +212,6 @@ void __init setup_arch(char **cmdline_p) unsigned long endmem, startmem; #endif int i; - char *p, *q; /* The bootinfo is located right after the kernel bss */ m68k_parse_bootinfo((const struct bi_record *)&_end); @@ -258,40 +254,7 @@ void __init setup_arch(char **cmdline_p) *cmdline_p = m68k_command_line; memcpy(boot_command_line, *cmdline_p, CL_SIZE); - /* Parse the command line for arch-specific options. - * For the m68k, this is currently only "debug=xxx" to enable printing - * certain kernel messages to some machine-specific device. - */ - for (p = *cmdline_p; p && *p;) { - i = 0; - if (!strncmp(p, "debug=", 6)) { - strlcpy(m68k_debug_device, p+6, sizeof(m68k_debug_device)); - q = strchr(m68k_debug_device, ' '); - if (q) - *q = 0; - i = 1; - } -#ifdef CONFIG_ATARI - /* This option must be parsed very early */ - if (!strncmp(p, "switches=", 9)) { - extern void atari_switches_setup(const char *, int); - q = strchr(p + 9, ' '); - atari_switches_setup(p + 9, q ? (q - (p + 9)) : strlen(p + 9)); - i = 1; - } -#endif - - if (i) { - /* option processed, delete it */ - if ((q = strchr(p, ' '))) - strcpy(p, q + 1); - else - *p = 0; - } else { - if ((p = strchr(p, ' '))) - ++p; - } - } + parse_early_param(); #ifdef CONFIG_DUMMY_CONSOLE conswitchp = &dummy_con; |