diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:47:44 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:47:44 +0000 |
| commit | ce7a3f3db827012e90ceae068572d813643e3d32 (patch) | |
| tree | 0ae05de73cea41d13e2f5c537dad97ae7e34fc33 /arch/mips/kernel | |
| parent | c7c4310f7fc1485925d800628bf50b3aeab535ef (diff) | |
Support for the Galileo Orion board. From Cort.
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/Makefile | 4 | ||||
| -rw-r--r-- | arch/mips/kernel/setup.c | 17 |
2 files changed, 14 insertions, 7 deletions
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index e213c0d38..d140184a6 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -39,7 +39,9 @@ ifndef CONFIG_DECSTATION ifndef CONFIG_BAGET_MIPS O_OBJS += time.o ifndef CONFIG_SGI_IP22 - OX_OBJS += irq.o + ifndef CONFIG_ORION + OX_OBJS += irq.o + endif endif endif endif diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 809d13a85..99f254b69 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -1,5 +1,4 @@ -/* $Id: setup.c,v 1.28 2000/03/13 22:21:44 harald 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 * for more details. @@ -25,6 +24,7 @@ #include <linux/utsname.h> #include <linux/a.out.h> #include <linux/tty.h> +#include <linux/bootmem.h> #ifdef CONFIG_BLK_DEV_RAM #include <linux/blk.h> #endif @@ -201,6 +201,9 @@ static inline void cpu_probe(void) case PRID_IMP_R10000: mips_cputype = CPU_R10000; break; + case PRID_IMP_RM7000: + mips_cputype = CPU_R5000; + break; default: mips_cputype = CPU_UNKNOWN; } @@ -250,10 +253,6 @@ static void __init default_irq_setup(void) void __init setup_arch(char **cmdline_p) { -#ifdef CONFIG_BLK_DEV_INITRD - unsigned long tmp; - unsigned long *initrd_header; -#endif void baget_setup(void); void cobalt_setup(void); void decstation_setup(void); @@ -262,6 +261,7 @@ void __init setup_arch(char **cmdline_p) void sni_rm200_pci_setup(void); void sgi_setup(void); void ddb_setup(void); + void orion_setup(void); /* Save defaults for configuration-dependent routines. */ irq_setup = default_irq_setup; @@ -318,6 +318,11 @@ void __init setup_arch(char **cmdline_p) ddb_setup(); break; #endif +#ifdef CONFIG_ORION + case MACH_GROUP_ORION: + orion_setup(); + break; +#endif default: panic("Unsupported architecture"); } |