diff options
| author | Harald Koerfgen <hkoerfg@web.de> | 1999-05-01 12:23:43 +0000 |
|---|---|---|
| committer | Harald Koerfgen <hkoerfg@web.de> | 1999-05-01 12:23:43 +0000 |
| commit | c19daa94ab746a6c9083c7ffb5cdffc3f41e339b (patch) | |
| tree | 20af8aa7a8b2ec5f603b9058c5a53f3246e71764 /arch/mips/kernel | |
| parent | 94f05bab9bf52258637e467fd89ae4f168736f4a (diff) | |
Various changes to Makefiles and Config.in files to be able to make use of the new DECstation and Baget stuff :-)
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/Makefile | 7 | ||||
| -rw-r--r-- | arch/mips/kernel/setup.c | 14 |
2 files changed, 17 insertions, 4 deletions
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index ef8709bcd..9d296130d 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -26,8 +26,11 @@ endif # SGI's have very different interrupt/timer hardware. # ifndef CONFIG_SGI -O_OBJS += time.o -OX_OBJS += irq.o + ifndef CONFIG_DECSTATION + ifndef CONFIG_BAGET_MIPS + O_OBJS += irq.o time.o + endif + endif endif # diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index c5f280a3e..1d9b76b5c 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -1,4 +1,4 @@ -/* $Id: setup.c,v 1.12 1999/02/06 03:57:41 adevries Exp $ +/* $Id: setup.c,v 1.13 1999/03/13 12:33:26 tsbogend 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 @@ -103,7 +103,6 @@ unsigned long mips_memory_upper = KSEG0; /* this is set by kernel_entry() */ unsigned long mips_cputype = CPU_UNKNOWN; unsigned long mips_machtype = MACH_UNKNOWN; unsigned long mips_machgroup = MACH_GROUP_UNKNOWN; -unsigned long mips_tlb_entries = 48; /* Guess which CPU I've got :) */ unsigned char aux_device_present; extern int _end; @@ -150,6 +149,7 @@ __initfunc(void setup_arch(char **cmdline_p, unsigned long tmp; unsigned long *initrd_header; #endif + void baget_setup(void); void cobalt_setup(void); void decstation_setup(void); void deskstation_setup(void); @@ -173,11 +173,21 @@ __initfunc(void setup_arch(char **cmdline_p, switch(mips_machgroup) { +#ifdef CONFIG_BAGET_MIPS + case MACH_GROUP_UNKNOWN: + baget_setup(); + break; +#endif #ifdef CONFIG_COBALT_MICRO_SERVER case MACH_GROUP_COBALT: cobalt_setup(); break; #endif +#ifdef CONFIG_DECSTATION + case MACH_GROUP_DEC: + decstation_setup(); + break; +#endif #ifdef CONFIG_MIPS_JAZZ case MACH_GROUP_JAZZ: jazz_setup(); |