diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2007-05-01 16:32:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 20:59:06 -0400 |
commit | d6713b4091a99fa2af2fabdcd2f3fb97f32ecf2e (patch) | |
tree | 7cabd0ff35f9ec4413ba936ddb203d13dffb1550 /arch/m68k/mac | |
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/mac')
-rw-r--r-- | arch/m68k/mac/config.c | 8 | ||||
-rw-r--r-- | arch/m68k/mac/debug.c | 20 |
2 files changed, 10 insertions, 18 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index d2fbf436a1fb..5fd413246f89 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c | |||
@@ -82,10 +82,6 @@ extern void mac_mksound(unsigned int, unsigned int); | |||
82 | 82 | ||
83 | extern void nubus_sweep_video(void); | 83 | extern void nubus_sweep_video(void); |
84 | 84 | ||
85 | /* Mac specific debug functions (in debug.c) */ | ||
86 | extern void mac_debug_init(void); | ||
87 | extern void mac_debugging_long(int, long); | ||
88 | |||
89 | static void mac_get_model(char *str); | 85 | static void mac_get_model(char *str); |
90 | 86 | ||
91 | static void mac_sched_init(irq_handler_t vector) | 87 | static void mac_sched_init(irq_handler_t vector) |
@@ -180,9 +176,6 @@ void __init config_mac(void) | |||
180 | mach_halt = mac_poweroff; | 176 | mach_halt = mac_poweroff; |
181 | mach_power_off = mac_poweroff; | 177 | mach_power_off = mac_poweroff; |
182 | mach_max_dma_address = 0xffffffff; | 178 | mach_max_dma_address = 0xffffffff; |
183 | #if 0 | ||
184 | mach_debug_init = mac_debug_init; | ||
185 | #endif | ||
186 | #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) | 179 | #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) |
187 | mach_beep = mac_mksound; | 180 | mach_beep = mac_mksound; |
188 | #endif | 181 | #endif |
@@ -802,7 +795,6 @@ void mac_identify(void) | |||
802 | /* the serial ports set to "Faster" mode in MacOS. */ | 795 | /* the serial ports set to "Faster" mode in MacOS. */ |
803 | 796 | ||
804 | iop_preinit(); | 797 | iop_preinit(); |
805 | mac_debug_init(); | ||
806 | 798 | ||
807 | printk(KERN_INFO "Detected Macintosh model: %d \n", model); | 799 | printk(KERN_INFO "Detected Macintosh model: %d \n", model); |
808 | 800 | ||
diff --git a/arch/m68k/mac/debug.c b/arch/m68k/mac/debug.c index 83990326099b..7a5bed5bdc57 100644 --- a/arch/m68k/mac/debug.c +++ b/arch/m68k/mac/debug.c | |||
@@ -27,10 +27,6 @@ | |||
27 | #include <asm/machw.h> | 27 | #include <asm/machw.h> |
28 | #include <asm/macints.h> | 28 | #include <asm/macints.h> |
29 | 29 | ||
30 | extern char m68k_debug_device[]; | ||
31 | |||
32 | extern struct compat_bootinfo compat_boot_info; | ||
33 | |||
34 | extern unsigned long mac_videobase; | 30 | extern unsigned long mac_videobase; |
35 | extern unsigned long mac_videodepth; | 31 | extern unsigned long mac_videodepth; |
36 | extern unsigned long mac_rowbytes; | 32 | extern unsigned long mac_rowbytes; |
@@ -360,16 +356,18 @@ void mac_init_sccb_port(int cflag) | |||
360 | mac_init_scc_port(cflag, 1); | 356 | mac_init_scc_port(cflag, 1); |
361 | } | 357 | } |
362 | 358 | ||
363 | void __init mac_debug_init(void) | 359 | static int __init mac_debug_setup(char *arg) |
364 | { | 360 | { |
361 | if (!MACH_IS_MAC) | ||
362 | return 0; | ||
363 | |||
365 | #ifdef DEBUG_SERIAL | 364 | #ifdef DEBUG_SERIAL |
366 | if (!strcmp(m68k_debug_device, "ser") || | 365 | if (!strcmp(arg, "ser") || !strcmp(arg, "ser1")) { |
367 | !strcmp(m68k_debug_device, "ser1")) { | ||
368 | /* Mac modem port */ | 366 | /* Mac modem port */ |
369 | mac_init_scc_port(B9600|CS8, 0); | 367 | mac_init_scc_port(B9600|CS8, 0); |
370 | mac_console_driver.write = mac_scca_console_write; | 368 | mac_console_driver.write = mac_scca_console_write; |
371 | scc_port = 0; | 369 | scc_port = 0; |
372 | } else if (!strcmp(m68k_debug_device, "ser2")) { | 370 | } else if (!strcmp(arg, "ser2")) { |
373 | /* Mac printer port */ | 371 | /* Mac printer port */ |
374 | mac_init_scc_port(B9600|CS8, 1); | 372 | mac_init_scc_port(B9600|CS8, 1); |
375 | mac_console_driver.write = mac_sccb_console_write; | 373 | mac_console_driver.write = mac_sccb_console_write; |
@@ -377,12 +375,14 @@ void __init mac_debug_init(void) | |||
377 | } | 375 | } |
378 | #endif | 376 | #endif |
379 | #ifdef DEBUG_HEADS | 377 | #ifdef DEBUG_HEADS |
380 | if (!strcmp(m68k_debug_device, "scn") || | 378 | if (!strcmp(arg, "scn") || !strcmp(arg, "con")) { |
381 | !strcmp(m68k_debug_device, "con")) { | ||
382 | /* display, using head.S console routines */ | 379 | /* display, using head.S console routines */ |
383 | mac_console_driver.write = mac_debug_console_write; | 380 | mac_console_driver.write = mac_debug_console_write; |
384 | } | 381 | } |
385 | #endif | 382 | #endif |
386 | if (mac_console_driver.write) | 383 | if (mac_console_driver.write) |
387 | register_console(&mac_console_driver); | 384 | register_console(&mac_console_driver); |
385 | return 0; | ||
388 | } | 386 | } |
387 | |||
388 | early_param("debug", mac_debug_setup); | ||