Re: GENERIC cats kernel fails to build...

[Robert Swindells <rjs%fdy2.demon.co.uk@localhost>]

>Well I found time and a GENERIC kernel now boots again.  Just have to hope 
>that the kernel never gets so bloated to need more than 8MB of space for the 
>kernel and kernel stacks.

I had a problem building a kernel for my machine until I added a prototype
for isa_cats_init to cats_machdep.c

I'm also unable to compile arch/arm/mainbus.c without the second
change below.

Robert Swindells

Index: cats_machdep.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/cats/cats/cats_machdep.c,v
retrieving revision 1.9
diff -u -r1.9 cats_machdep.c
--- cats_machdep.c      2002/01/12 13:37:55     1.9
+++ cats_machdep.c      2002/01/13 00:34:21
@@ -154,6 +154,8 @@
 int fcomcnattach __P((u_int iobase, int rate,tcflag_t cflag));
 int fcomcndetach __P((void));
 
+void isa_cats_init     __P((u_int iobase, u_int membase));
+
 void map_section       __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa,
                             int cacheable));
 void map_pagetable     __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa));


Index: mainbus.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/mainbus/mainbus.c,v
retrieving revision 1.3
diff -u -r1.3 mainbus.c
--- mainbus.c   2001/06/13 17:52:43     1.3
+++ mainbus.c   2002/01/13 00:42:39
@@ -48,7 +48,7 @@
 #include <sys/malloc.h>
 #include <sys/device.h>
 
-#if defined(arm32)             /* XXX */
+#if defined(acorn32)           /* XXX */
 #include <machine/io.h>
 #endif
 #include <machine/bus.h>
@@ -140,7 +140,7 @@
                        mb.mb_irq = MAINBUSCF_IRQ_DEFAULT;
                } else {    
                        mb.mb_iobase = cf->cf_loc[MAINBUSCF_BASE];
-#if defined(arm32) /* XXX */
+#if defined(acorn32) /* XXX */
                        mb.mb_iobase += IO_CONF_BASE;
 #endif
                        mb.mb_iosize = 0;