diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/Makefile | 13 | ||||
| -rw-r--r-- | arch/mips/dec/prom/init.c | 3 | ||||
| -rw-r--r-- | arch/mips/dec/setup.c | 8 |
3 files changed, 18 insertions, 6 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 */ |