Update Baget stuff

3 files changed, 17 insertions, 24 deletions

diff --git a/arch/mips/baget/Makefile b/arch/mips/baget/Makefile
index 6a16ad464..f27a9e6f3 100644
--- a/arch/mips/baget/Makefile
+++ b/arch/mips/baget/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile,v 1.3 1999/08/13 17:07:26 harald Exp $
 #
 # Makefile for the Baget specific kernel interface routines
 # under Linux.
@@ -11,11 +11,8 @@
 
 all: baget.a 
 
-image:	../../../vmlinux
-	cp -f $< $@
-
 O_TARGET := baget.a
-O_OBJS   := baget.o print.o setup.o time.o irq.o bagetIRQ.o reset.o
+O_OBJS   := baget.o print.o setup.o time.o irq.o bagetIRQ.o reset.o wbflush.o
 
 ifeq ($(CONFIG_SERIAL),y)
 	OX_OBJS += vacserial.o
@@ -38,8 +35,8 @@ bagetIRQ.o : bagetIRQ.S
 
 ##################### Baget Loader stuff ########################
 
-dummy.c:
-	touch $@
+image: ../../../vmlinux
+	cp -f $< $@
 
 image.bin: image
 	$(OBJCOPY) -O binary $< $@
@@ -47,6 +44,9 @@ image.bin: image
 ramdisk.bin:
 	echo "Dummy ramdisk used. Provide your own if needed !" > $@
 
+dummy.c:
+	touch $@
+
 dummy.o: dummy.c image.bin ramdisk.bin
 	$(CC) $(CFLAGS) -c -o $@ $<
 	$(OBJCOPY) --add-section=.vmlinux=image.bin \
@@ -54,10 +54,11 @@ dummy.o: dummy.c image.bin ramdisk.bin
 
 balo.h: image
 	$(NM) $< | awk ' \
-            BEGIN               { printf "/* DO NOT EDIT THIS FILE */\n" }    \
-	    /kernel_entry/      { printf "#define START 0x%s\n", $$1 }        \
-            /balo_ramdisk_base/ { printf "#define RAMDISK_BASE 0x%s\n", $$1 } \
-	    /balo_ramdisk_size/ { printf "#define RAMDISK_SIZE 0x%s\n", $$1 } \
+	BEGIN               { printf "/* DO NOT EDIT THIS FILE */\n" }    \
+	/_ftext/            { printf "#define LOADADDR 0x%s\n", $$1     } \
+	/kernel_entry/      { printf "#define START 0x%s\n", $$1 }        \
+	/balo_ramdisk_base/ { printf "#define RAMDISK_BASE 0x%s\n", $$1 } \
+	/balo_ramdisk_size/ { printf "#define RAMDISK_SIZE 0x%s\n", $$1 } \
                        ' > $@
 balo.o:   balo.c balo.h
 	$(CC) $(CFLAGS) -c $< 
@@ -69,7 +70,6 @@ balo:   balo.o dummy.o balo_supp.o print.o
 	$(LD) $(LDFLAGS) -T ld.script.balo -o $@ $^ 
 
 clean:
-	rm -f balo.o balo.h dummy.o dummy.c hello.o image.bin image balo_supp.o
-	rm -f $(O_OBJS) $(O_TARGET)
+	rm -f balo balo.h dummy.c image image.bin
 
 include $(TOPDIR)/Rules.make
diff --git a/arch/mips/baget/baget.c b/arch/mips/baget/baget.c
index af61bd171..ef03dca06 100644
--- a/arch/mips/baget/baget.c
+++ b/arch/mips/baget/baget.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: baget.c,v 1.1 1999/01/17 03:49:37 ralf Exp $
  *
  * baget.c: Baget low level stuff
  *
@@ -13,16 +13,10 @@
 #include <asm/bootinfo.h>
 #include <asm/mipsregs.h>
 #include <asm/pgtable.h>
+#include <asm/pgalloc.h>
 
 #include <asm/baget/baget.h>
 
-/* 
- * Following values are set by BALO into RAM disk buffer parameters
- */
-unsigned long balo_ramdisk_base = 0xBA;  /* Signature for BALO ! */
-unsigned long balo_ramdisk_size = 0;
-
-
 /*
  *  Following code is based on routines from 'mm/vmalloc.c'
  *  Additional parameters  ioaddr  is needed to iterate across real I/O address.
diff --git a/arch/mips/baget/irq.c b/arch/mips/baget/irq.c
index cd12ea66a..08b15a7a8 100644
--- a/arch/mips/baget/irq.c
+++ b/arch/mips/baget/irq.c
@@ -5,7 +5,7 @@
  *      Code (mostly sleleton and comments) derived from DECstation IRQ
  *      handling.
  *
- * $Id: irq.c,v 1.5 1999/12/04 03:58:59 ralf Exp $
+ * $Id: irq.c,v 1.6 2000/02/04 07:40:23 ralf Exp $
  */
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -29,8 +29,7 @@
 
 #include <asm/baget/baget.h>
 
-unsigned int local_bh_count[NR_CPUS];
-unsigned int local_irq_count[NR_CPUS];
+irq_cpustat_t irq_stat [NR_CPUS];
 unsigned long spurious_count = 0;
 
 /*