On Mon, Mar 15, 2004 at 10:17:37AM +0100, Geert Uytterhoeven wrote:
> On Mon, 15 Mar 2004, Christian T. Steigies wrote:
> > BTW no need to waste your time to test 2.4.x on a mac, still does not work
> > for me, but I do take patches. Works great on my Amiga though, but with a
>
> Please CC those patches to linux-m68k, so I can update CVS.
>
> Christian: any stuff in your tree that's not yet in m68k CVS?
Nothing significant, I use m68k CVS, diff it against i386 CVS and apply that
to debian kernel-source. My patches basically just fix what kernel-source
breaks for m68k. The only significant change is probably, that I build with
gcc-2.95, anything newer does not seem to compile (havent't tested this
myself yet). I'll attach the patches. If they don't apply, that means the
patch fixes a typo introduced by the debian kernel-source. The lyra patch is
kind of experimental, the lyra adapter does not work as I had hoped, I
haven't tested it in a long time. But I think there is really nothing that
has to go into CVS.
Christian
--- kernel-source-2.4.24/include/net/flow.h.orig 2004-02-08
10:21:09.000000000 -0500
+++ kernel-source-2.4.24/include/net/flow.h 2004-02-13 15:44:24.000000000
-0500
@@ -59,6 +59,7 @@
#define fl_ipsec_spi uli_u.spi
u32 __pad;
+ __u16 pad1;
};
#define FLOW_DIR_IN 0
--- kernel-source-2.4.24/Makefile.orig 2004-02-19 22:48:43.000000000 +0100
+++ kernel-source-2.4.24/Makefile 2004-02-21 11:32:46.000000000 +0100
@@ -16,7 +16,7 @@
HPATH = $(TOPDIR)/include
FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net
$(HPATH)/math-emu
-HOSTCC = gcc
+HOSTCC = gcc-2.95
HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
CROSS_COMPILE =
@@ -27,7 +27,7 @@
AS = $(CROSS_COMPILE)as
LD = $(CROSS_COMPILE)ld
-CC = $(CROSS_COMPILE)gcc
+CC = $(CROSS_COMPILE)gcc-2.95
CPP = $(CC) -E
AR = $(CROSS_COMPILE)ar
NM = $(CROSS_COMPILE)nm
--- kernel-source-2.4.24/include/asm-m68k/scatterlist.h.orig 2002-08-03
02:39:45.000000000 +0200
+++ kernel-source-2.4.24/include/asm-m68k/scatterlist.h 2004-02-21
10:24:06.000000000 +0100
@@ -1,6 +1,8 @@
#ifndef _M68K_SCATTERLIST_H
#define _M68K_SCATTERLIST_H
+#include <asm/types.h> /* otherwise __u32 is unknown */
+
struct scatterlist {
/* This will disappear in 2.5.x */
char *address;
--- kernel-source-2.4.20.orig/drivers/char/amikeyb.c 2000-11-27
20:57:34.000000000 -0500
+++ kernel-source-2.4.20/drivers/char/amikeyb.c 2003-06-14 16:28:30.000000000
-0400
@@ -264,9 +264,14 @@
case 0x78:
reset_warning = 1;
break;
+#if 0
case 0x79:
printk(KERN_WARNING "amikeyb: keyboard lost sync\n");
break;
+#else /* ignore this, Lyra produces this a lot, making the keyboard useless */
+ case 0x79:
+ break;
+#endif
case 0x7a:
printk(KERN_WARNING "amikeyb: keyboard buffer overflow\n");
break;
@@ -289,6 +294,10 @@
printk(KERN_WARNING "amikeyb: keyboard interrupt\n");
break;
#endif
+#if 1 /* ignore this code, Lyra produces this a lot, making the keyboard
useless */
+ case 0xff:
+ break;
+#endif
default:
printk(KERN_WARNING "amikeyb: unknown keyboard communication
code 0x%02x\n",
scancode);
--- kernel-source-2.4.20/drivers/char/Makefile.orig 2003-04-16
09:05:52.000000000 -0400
+++ kernel-source-2.4.20/drivers/char/Makefile 2003-04-16 20:11:16.000000000
-0400
@@ -59,9 +59,7 @@
ifdef CONFIG_AMIGA
KEYBD = amikeyb.o
else
- ifndef CONFIG_MAC
- KEYBD =
- endif
+ KEYBD =
endif
SERIAL =
endif
--- kernel-source-2.4.20/drivers/video/modedb.c.orig 2003-06-22
11:38:46.000000000 -0400
+++ kernel-source-2.4.20/drivers/video/modedb.c 2003-06-22 11:44:42.000000000
-0400
@@ -16,8 +16,6 @@
#include <linux/fb.h>
#include <linux/console_struct.h>
#include <linux/sched.h>
-#include <video/fbcon.h>
-
#undef DEBUG
