combine macserial.o and serial.o in one binary

[Olaf H. <ol...@su...>]

Hi,

I try to combine macserial.o and serial.o in one binary:
CONFIG_MAC_SERIAL=y
CONFIG_SERIAL_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_SERIAL_CONSOLE=y

I applied that patch to drivers/char/tty_io.c:
diff -urN linuxppc_2_4/drivers/char/tty_io.c linuxppc_2_4.serialconsole/drivers/char/tty_io.c
--- linuxppc_2_4/drivers/char/tty_io.c  Sat Feb 17 05:03:25 2001
+++ linuxppc_2_4.serialconsole/drivers/char/tty_io.c    Mon Mar 19
09:20:24 2001
@@ -2172,11 +2173,17 @@
 #ifdef CONFIG_SERIAL_CONSOLE
 #if (defined(CONFIG_8xx) || defined(CONFIG_8260))
        console_8xx_init();
-#elif defined(CONFIG_MAC_SERIAL)
-       mac_scc_console_init();
-#elif defined(CONFIG_SERIAL)
-       serial_console_init();
 #endif /* CONFIG_8xx */
+#if defined(CONFIG_MAC_SERIAL)
+       if (_machine == _MACH_Pmac)
+               mac_scc_console_init();
+#endif
+#if defined(CONFIG_SERIAL)
+#ifdef __powerpc__
+       if (_machine == _MACH_chrp || _machine == _MACH_prep)
+#endif
+               serial_console_init();
+#endif
 #ifdef CONFIG_SGI_SERIAL
        sgi_serial_console_init();
 #endif


That gives me a serial console output on a Pmac and on a IBM machine
with a PC style serial port. But the IBM machine can not open the
initial console:
Warning: unable to open an initial console.

My first thought was to rename the conflicting/duplicate function names
in macserial.c, I just added a mac_*. But that doesnt work at all.

Any ideas how to get this to work?



Gruss Olaf

-- 
 $ man clone

BUGS
       Main feature not yet implemented...