Some minor bugfixes

5 files changed, 26 insertions, 7 deletions

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 9dc992778..5e448e13f 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.14 1999/01/27 23:59:02 ralf Exp $
+# $Id: Makefile,v 1.16 1999/02/09 23:11:30 adevries Exp $
 #
 # This file is subject to the terms and conditions of the GNU General Public
 # License.  See the file "COPYING" in the main directory of this archive
@@ -173,7 +173,16 @@ HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
 
 SUBDIRS := $(SUBDIRS) $(addprefix arch/mips/, kernel mm lib tools)
 CORE_FILES := arch/mips/kernel/kernel.o arch/mips/mm/mm.o $(CORE_FILES)
-LIBS := arch/mips/lib/lib.a $(LIBS) arch/mips/lib/lib.a
+LIBS := arch/mips/lib/lib.a $(LIBS)
+
+ifdef CONFIG_BAGET_MIPS
+
+BAGETBOOT = $(MAKE) -C arch/$(ARCH)/baget
+
+balo:  vmlinux
+	$(BAGETBOOT) balo
+
+endif
 
 MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
 
diff --git a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c
index 717dda622..2cb9da66c 100644
--- a/arch/mips/dec/prom/init.c
+++ b/arch/mips/dec/prom/init.c
@@ -85,6 +85,9 @@ __initfunc(int prom_init(int argc, char **argv,
 	/* Determine which PROM's we have (and therefore which machine we're on!) */
 	which_prom(magic, prom_vec);
 
+	if (magic == REX_PROM_MAGIC)
+		rex_clear_cache();
+
 	prom_meminit(magic);
 	prom_identify_arch(magic);
 	prom_init_cmdline(argc, argv, magic);
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c
index d7fbc4a13..3b2422418 100644
--- a/arch/mips/dec/setup.c
+++ b/arch/mips/dec/setup.c
@@ -257,13 +257,13 @@ __initfunc(void dec_init_kn02(void))
 
     dec_interrupt[MEMORY].cpu_mask = IE_IRQ3;
     dec_interrupt[MEMORY].iemask = 0;
-    cpu_mask_tbl[1] = IE_IRQ3;
-    cpu_irq_nr[1] = MEMORY;
+    cpu_mask_tbl[2] = IE_IRQ3;
+    cpu_irq_nr[2] = MEMORY;
 
     dec_interrupt[FPU].cpu_mask = IE_IRQ5;
     dec_interrupt[FPU].iemask = 0;
-    cpu_mask_tbl[2] = IE_IRQ5;
-    cpu_irq_nr[2] = FPU;
+    cpu_mask_tbl[3] = IE_IRQ5;
+    cpu_irq_nr[3] = FPU;
 
 }				/* dec_init_kn02 */
 
diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c
index 68201da87..edb8a41cc 100644
--- a/drivers/block/genhd.c
+++ b/drivers/block/genhd.c
@@ -1224,6 +1224,7 @@ static int ultrix_partition(struct gendisk *hd, kdev_t dev, unsigned long first_
 					      label->pt_part[i].pi_blkoff,
 					      label->pt_part[i].pi_nblocks);
 		brelse(bh);
+		printk ("\n");
 		return 1;
 	} else {
 		brelse(bh);
diff --git a/drivers/char/dz.c b/drivers/char/dz.c
index 347638591..c26a448e8 100644
--- a/drivers/char/dz.c
+++ b/drivers/char/dz.c
@@ -1401,7 +1401,7 @@ __initfunc(int dz_init(void))
 static void dz_console_put_char (unsigned char ch)
 {
   long flags;
-  int  loops = 1000;
+  int  loops = 2500;
   unsigned short tmp = ch;
   /* this code sends stuff out to serial device - spinning its
       wheels and waiting. */
@@ -1513,7 +1513,10 @@ __initfunc(static int dz_console_setup(struct console *co, char *options))
 
 	/* TOFIX: force to console line */
 	dz_console = &multi[CONSOLE_LINE];
+    	if ((mips_machtype == MACH_DS23100) || (mips_machtype == MACH_DS5100)) 
 	dz_console->port = KN01_DZ11_BASE;
+       	else 
+       		dz_console->port = KN02_DZ11_BASE; 
 	dz_console->line = CONSOLE_LINE;
 
 	dz_out(dz_console, DZ_CSR, DZ_CLR);
@@ -1541,7 +1544,10 @@ __initfunc(static int dz_console_setup(struct console *co, char *options))
 
 	/* TOFIX: force to console line */
 	dz_console = &multi[CONSOLE_LINE];
+    	if ((mips_machtype == MACH_DS23100) || (mips_machtype == MACH_DS5100)) 
 	dz_console->port = KN01_DZ11_BASE;
+       	else 
+       		dz_console->port = KN02_DZ11_BASE; 
 	dz_console->line = CONSOLE_LINE;
 
 	dz_out(dz_console, DZ_CSR, DZ_CLR);