linuxppc_2_4_devel patch for gt64260_mpsc

Patch that:

- Adds early initialization of MPSC for kgdb and progress.
- Creates polled getc routine for kgdb.
- Creates polled getc routine for kgdb and progress (previously in arch/ppc/kernel/gt64260_common.c).
- Adds MAGIC_SYSRQ support.

Mark

===== drivers/char/Config.in 1.51 vs edited =====

@@ -54,9 +54,6 @@
 	 bool '    MPSC Console support' CONFIG_GT64260_CONSOLE
 	 if [ "$CONFIG_GT64260_CONSOLE" = "y" ]; then
 	    define_bool CONFIG_SERIAL_CONSOLE y
-	    choice 'Default console port' \
-	       "MPSC0		CONFIG_GT64260_CONSOLE_0 \
-		MPSC1		CONFIG_GT64260_CONSOLE_1" MPSC0
 	    if [ "$CONFIG_USE_PPCBOOT" != "y" ]; then
 	       int 'Serial Console Baudrate' CONFIG_SERIAL_CONSOLE_BAUD 115200
 	    fi

===== drivers/char/gt64260_mpsc.c 1.3 vs edited =====

===== include/asm-ppc/gt64260.h 1.16 vs edited =====

@@ -350,6 +350,7 @@
 void gt64260_init_irq(void);
 int gt64260_get_irq(struct pt_regs *regs);
 
+void gt64260_progress_init(void);
 void gt64260_mpsc_progress(char *s, unsigned short hex);
 
 void gt64260_set_intr_mask_reg_offsets(int cpu,

@@ -357,5 +358,10 @@
 					u32 hi_reg_offset);
 
 void gt64260_set_mac_addr(int selector, unsigned char *mac_addr);
+
+void gt_early_mpsc_init(int chan, unsigned short cflag);
+void gt_polled_putc(int chan, char c);
+int gt_polled_getc(int chan, unsigned char *c);
+
 
 #endif /* __ASMPPC_GT64260_H */

Doesn't apply cleanly:

$ patch -p1 < gt_mpsc.patch
Get file drivers/char/Config.in from SCCS with lock? [y]
drivers/char/Config.in 1.51 -> 1.52: 405 lines
patching file drivers/char/Config.in
Get file drivers/char/gt64260_mpsc.c from SCCS with lock? [y]
drivers/char/gt64260_mpsc.c 1.3 -> 1.4: 1907 lines
patching file drivers/char/gt64260_mpsc.c
Hunk #5 FAILED at 977.
Hunk #6 FAILED at 1003.
Hunk #15 succeeded at 1806 with fuzz 1.
2 out of 19 hunks FAILED -- saving rejects to file
drivers/char/gt64260_mpsc.c.rej
Get file include/asm-ppc/gt64260.h from SCCS with lock? [y]
include/asm-ppc/gt64260.h 1.16 -> 1.17: 361 lines
patching file include/asm-ppc/gt64260.h

And since the others rely on this, I'm stopping here.

--
Tom Rini
http://gate.crashing.org/~trini/

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Hmm, interesting... There were trailing blanks at the end of some lines in that file which were stripped out by majordomo so the patch didn't match. I'll have to remember that (and try to figure out why people put blanks at the ends of lines).

FYI, I've resent that patches to trini directly and I expect that he will apply them.

Mark

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/