diff options
Diffstat (limited to 'arch/sparc64/kernel/setup.c')
-rw-r--r-- | arch/sparc64/kernel/setup.c | 70 |
1 files changed, 1 insertions, 69 deletions
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index aafde3dd9fd4..0f5be828ee92 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c | |||
@@ -133,33 +133,6 @@ static void __init process_switch(char c) | |||
133 | } | 133 | } |
134 | } | 134 | } |
135 | 135 | ||
136 | static void __init process_console(char *commands) | ||
137 | { | ||
138 | serial_console = 0; | ||
139 | commands += 8; | ||
140 | /* Linux-style serial */ | ||
141 | if (!strncmp(commands, "ttyS", 4)) | ||
142 | serial_console = simple_strtoul(commands + 4, NULL, 10) + 1; | ||
143 | else if (!strncmp(commands, "tty", 3)) { | ||
144 | char c = *(commands + 3); | ||
145 | /* Solaris-style serial */ | ||
146 | if (c == 'a' || c == 'b') { | ||
147 | serial_console = c - 'a' + 1; | ||
148 | prom_printf ("Using /dev/tty%c as console.\n", c); | ||
149 | } | ||
150 | /* else Linux-style fbcon, not serial */ | ||
151 | } | ||
152 | #if defined(CONFIG_PROM_CONSOLE) | ||
153 | if (!strncmp(commands, "prom", 4)) { | ||
154 | char *p; | ||
155 | |||
156 | for (p = commands - 8; *p && *p != ' '; p++) | ||
157 | *p = ' '; | ||
158 | conswitchp = &prom_con; | ||
159 | } | ||
160 | #endif | ||
161 | } | ||
162 | |||
163 | static void __init boot_flags_init(char *commands) | 136 | static void __init boot_flags_init(char *commands) |
164 | { | 137 | { |
165 | while (*commands) { | 138 | while (*commands) { |
@@ -176,9 +149,7 @@ static void __init boot_flags_init(char *commands) | |||
176 | process_switch(*commands++); | 149 | process_switch(*commands++); |
177 | continue; | 150 | continue; |
178 | } | 151 | } |
179 | if (!strncmp(commands, "console=", 8)) { | 152 | if (!strncmp(commands, "mem=", 4)) { |
180 | process_console(commands); | ||
181 | } else if (!strncmp(commands, "mem=", 4)) { | ||
182 | /* | 153 | /* |
183 | * "mem=XXX[kKmM]" overrides the PROM-reported | 154 | * "mem=XXX[kKmM]" overrides the PROM-reported |
184 | * memory size. | 155 | * memory size. |
@@ -378,44 +349,6 @@ void __init setup_arch(char **cmdline_p) | |||
378 | paging_init(); | 349 | paging_init(); |
379 | } | 350 | } |
380 | 351 | ||
381 | static int __init set_preferred_console(void) | ||
382 | { | ||
383 | int idev, odev; | ||
384 | |||
385 | /* The user has requested a console so this is already set up. */ | ||
386 | if (serial_console >= 0) | ||
387 | return -EBUSY; | ||
388 | |||
389 | idev = prom_query_input_device(); | ||
390 | odev = prom_query_output_device(); | ||
391 | if (idev == PROMDEV_IKBD && odev == PROMDEV_OSCREEN) { | ||
392 | serial_console = 0; | ||
393 | } else if (idev == PROMDEV_ITTYA && odev == PROMDEV_OTTYA) { | ||
394 | serial_console = 1; | ||
395 | } else if (idev == PROMDEV_ITTYB && odev == PROMDEV_OTTYB) { | ||
396 | serial_console = 2; | ||
397 | } else if (idev == PROMDEV_IRSC && odev == PROMDEV_ORSC) { | ||
398 | serial_console = 3; | ||
399 | } else if (idev == PROMDEV_IVCONS && odev == PROMDEV_OVCONS) { | ||
400 | /* sunhv_console_init() doesn't check the serial_console | ||
401 | * value anyways... | ||
402 | */ | ||
403 | serial_console = 4; | ||
404 | return add_preferred_console("ttyHV", 0, NULL); | ||
405 | } else { | ||
406 | prom_printf("Inconsistent console: " | ||
407 | "input %d, output %d\n", | ||
408 | idev, odev); | ||
409 | prom_halt(); | ||
410 | } | ||
411 | |||
412 | if (serial_console) | ||
413 | return add_preferred_console("ttyS", serial_console - 1, NULL); | ||
414 | |||
415 | return -ENODEV; | ||
416 | } | ||
417 | console_initcall(set_preferred_console); | ||
418 | |||
419 | /* BUFFER is PAGE_SIZE bytes long. */ | 352 | /* BUFFER is PAGE_SIZE bytes long. */ |
420 | 353 | ||
421 | extern char *sparc_cpu_type; | 354 | extern char *sparc_cpu_type; |
@@ -508,5 +441,4 @@ void sun_do_break(void) | |||
508 | prom_cmdline(); | 441 | prom_cmdline(); |
509 | } | 442 | } |
510 | 443 | ||
511 | int serial_console = -1; | ||
512 | int stop_a_enabled = 1; | 444 | int stop_a_enabled = 1; |