diff options
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/Makefile | 4 | ||||
| -rw-r--r-- | arch/mips/baget/Makefile | 26 | ||||
| -rw-r--r-- | arch/mips/baget/baget.c | 10 | ||||
| -rw-r--r-- | arch/mips/baget/irq.c | 5 | ||||
| -rw-r--r-- | arch/mips/kernel/proc.c | 4 | ||||
| -rw-r--r-- | arch/mips/kernel/setup.c | 4 |
6 files changed, 25 insertions, 28 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 41c3c7ffa..baccc3980 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.21 1999/09/28 22:25:44 ralf Exp $ +# $Id: Makefile,v 1.22 2000/01/26 00:07:44 ralf 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 @@ -125,6 +125,7 @@ endif ifdef CONFIG_BAGET_MIPS SUBDIRS += arch/mips/baget arch/mips/baget/prom LIBS += arch/mips/baget/baget.a arch/mips/baget/prom/bagetlib.a +LOADADDR += 0x80001000 endif # @@ -189,6 +190,7 @@ archclean: @$(MAKEBOOT) clean $(MAKE) -C arch/$(ARCH)/kernel clean $(MAKE) -C arch/$(ARCH)/tools clean + $(MAKE) -C arch/mips/baget clean archmrproper: 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; /* diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index 9bffcdc96..48a5d0af8 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c @@ -34,6 +34,7 @@ int get_cpuinfo(char *buffer) const char *mach_sgi_names[] = GROUP_SGI_NAMES; const char *mach_cobalt_names[] = GROUP_COBALT_NAMES; const char *mach_nec_ddb_names[] = GROUP_NEC_DDB_NAMES; + const char *mach_baget_names[] = GROUP_BAGET_NAMES; const char **mach_group_to_name[] = { mach_unknown_names, mach_jazz_names, mach_dec_names, @@ -42,7 +43,8 @@ int get_cpuinfo(char *buffer) mach_acn_names, mach_sgi_names, mach_cobalt_names, - mach_nec_ddb_names }; + mach_nec_ddb_names, + mach_baget_names }; unsigned int version = read_32bit_cp0_register(CP0_PRID); int len; diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index f6209461f..dad81e5e8 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -1,4 +1,4 @@ -/* $Id: setup.c,v 1.22 2000/01/27 01:05:23 ralf Exp $ +/* $Id: setup.c,v 1.23 2000/03/02 02:36:50 ralf 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 @@ -156,7 +156,7 @@ void __init setup_arch(char **cmdline_p) switch(mips_machgroup) { #ifdef CONFIG_BAGET_MIPS - case MACH_GROUP_UNKNOWN: + case MACH_GROUP_BAGET: baget_setup(); break; #endif |