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>

8 files changed, 77 insertions, 106 deletions

diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index c3b69b1b0c..3574853132 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -79,8 +79,6 @@ static char *amiga_models[] __initdata = {
 
 static char amiga_model_name[13] = "Amiga ";
 
-extern char m68k_debug_device[];
-
 static void amiga_sched_init(irq_handler_t handler);
 /* amiga specific irq functions */
 extern void amiga_init_IRQ(void);
@@ -95,12 +93,10 @@ static unsigned int amiga_get_ss(void);
 extern void amiga_mksound(unsigned int count, unsigned int ticks);
 static void amiga_reset(void);
 extern void amiga_init_sound(void);
-static void amiga_savekmsg_init(void);
 static void amiga_mem_console_write(struct console *co, const char *b,
                                     unsigned int count);
 void amiga_serial_console_write(struct console *co, const char *s,
                                 unsigned int count);
-static void amiga_debug_init(void);
 #ifdef CONFIG_HEARTBEAT
 static void amiga_heartbeat(int on);
 #endif
@@ -370,7 +366,6 @@ void __init config_amiga(void)
 {
         int i;
 
-        amiga_debug_init();
         amiga_identify();
 
         /* Yuk, we don't have PCI memory */
@@ -458,17 +453,6 @@ void __init config_amiga(void)
         /* initialize chipram allocator */
         amiga_chip_init();
 
-        /* debugging using chipram */
-        if (!strcmp(m68k_debug_device, "mem")) {
-                if (!AMIGAHW_PRESENT(CHIP_RAM))
-                        printk("Warning: no chipram present for debugging\n");
-                else {
-                        amiga_savekmsg_init();
-                        amiga_console_driver.write = amiga_mem_console_write;
-                        register_console(&amiga_console_driver);
-                }
-        }
-
         /* our beloved beeper */
         if (AMIGAHW_PRESENT(AMI_AUDIO))
                 amiga_init_sound();
@@ -787,17 +771,33 @@ static void amiga_mem_console_write(struct console *co, const char *s,
         }
 }
 
-static void amiga_savekmsg_init(void)
+static int __init amiga_savekmsg_setup(char *arg)
 {
         static struct resource debug_res = { .name = "Debug" };
 
+        if (!MACH_IS_AMIGA || strcmp(arg, "mem"))
+                goto done;
+
+        if (!AMIGAHW_PRESENT(CHIP_RAM)) {
+                printk("Warning: no chipram present for debugging\n");
+                goto done;
+        }
+
         savekmsg = amiga_chip_alloc_res(SAVEKMSG_MAXMEM, &debug_res);
         savekmsg->magic1 = SAVEKMSG_MAGIC1;
         savekmsg->magic2 = SAVEKMSG_MAGIC2;
         savekmsg->magicptr = ZTWO_PADDR(savekmsg);
         savekmsg->size = 0;
+
+        amiga_console_driver.write = amiga_mem_console_write;
+        register_console(&amiga_console_driver);
+
+done:
+        return 0;
 }
 
+early_param("debug", amiga_savekmsg_setup);
+
 static void amiga_serial_putc(char c)
 {
         amiga_custom.serdat = (unsigned char)c | 0x100;
@@ -872,15 +872,18 @@ void amiga_serial_gets(struct console *co, char *s, int len)
 }
 #endif
 
-static void __init amiga_debug_init(void)
+static int __init amiga_debug_setup(char *arg)
 {
-        if (!strcmp(m68k_debug_device, "ser" )) {
+        if (MACH_IS_AMIGA && !strcmp(arg, "ser")) {
                 /* no initialization required (?) */
                 amiga_console_driver.write = amiga_serial_console_write;
                 register_console(&amiga_console_driver);
         }
+        return 0;
 }
 
+early_param("debug", amiga_debug_setup);
+
 #ifdef CONFIG_HEARTBEAT
 static void amiga_heartbeat(int on)
 {
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index b10e7addae..e40e5dcaa3 100644
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -69,9 +69,6 @@ extern int atari_tt_hwclk (int, struct rtc_time *);
 extern int atari_mste_set_clock_mmss (unsigned long);
 extern int atari_tt_set_clock_mmss (unsigned long);
 
-/* atari specific debug functions (in debug.c) */
-extern void atari_debug_init(void);
-
 
 /* ++roman: This is a more elaborate test for an SCC chip, since the plain
  * Medusa board generates DTACK at the SCC's standard addresses, but a SCC
@@ -137,15 +134,18 @@ int __init atari_parse_bootinfo(const struct bi_record *record)
 
 
 /* Parse the Atari-specific switches= option. */
-void __init atari_switches_setup(const char *str, unsigned len)
+static int __init atari_switches_setup(char *str)
 {
-        char switches[len+1];
+        char switches[strlen(str) + 1];
         char *p;
         int ovsc_shift;
         char *args = switches;
 
+        if (!MACH_IS_ATARI)
+                return 0;
+
         /* copy string to local array, strsep works destructively... */