diff options
| -rw-r--r-- | arch/mips/sgi/kernel/indy_hpc.c | 3 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip22/ip22-hpc.c | 3 | ||||
| -rw-r--r-- | include/asm-mips/bootinfo.h | 6 | ||||
| -rw-r--r-- | include/asm-mips64/bootinfo.h | 7 |
4 files changed, 15 insertions, 4 deletions
diff --git a/arch/mips/sgi/kernel/indy_hpc.c b/arch/mips/sgi/kernel/indy_hpc.c index 5f4ae7644..5019196a1 100644 --- a/arch/mips/sgi/kernel/indy_hpc.c +++ b/arch/mips/sgi/kernel/indy_hpc.c @@ -12,6 +12,7 @@ #include <asm/sgi/sgihpc.h> #include <asm/sgi/sgint23.h> #include <asm/sgialib.h> +#include <asm/bootinfo.h> /* #define DEBUG_SGIHPC */ @@ -50,10 +51,12 @@ void __init sgihpc_init(void) prom_printf("GUINESS "); #endif sgi_guiness = 1; + mips_machtype = MACH_SGI_INDY; } else { #ifdef DEBUG_SGIHPC prom_printf("FULLHOUSE "); #endif + mips_machtype = MACH_SGI_INDIGO2; sgi_guiness = 0; } sgi_boardid = brev; diff --git a/arch/mips64/sgi-ip22/ip22-hpc.c b/arch/mips64/sgi-ip22/ip22-hpc.c index 5e42803c1..f0b688e91 100644 --- a/arch/mips64/sgi-ip22/ip22-hpc.c +++ b/arch/mips64/sgi-ip22/ip22-hpc.c @@ -12,6 +12,7 @@ #include <asm/sgi/sgihpc.h> #include <asm/sgi/sgint23.h> #include <asm/sgialib.h> +#include <asm/bootinfo.h> #undef DEBUG_SGIHPC @@ -50,10 +51,12 @@ void __init sgihpc_init(void) prom_printf("GUINESS "); #endif sgi_guiness = 1; + mips_machtype = MACH_SGI_INDY; } else { #ifdef DEBUG_SGIHPC prom_printf("FULLHOUSE "); #endif + mips_machtype = MACH_SGI_INDIGO2; sgi_guiness = 0; } sgi_boardid = brev; diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h index 4084ba601..51ad431ba 100644 --- a/include/asm-mips/bootinfo.h +++ b/include/asm-mips/bootinfo.h @@ -88,9 +88,11 @@ /* * Valid machtype for group SGI */ -#define MACH_SGI_INDY 0 /* R4?K and R5K Indy workstaions */ +#define MACH_SGI_INDY 0 /* R4?K and R5K Indy workstations */ +#define MACH_SGI_CHALLENGE_S 1 /* The Challenge S server */ +#define MACH_SGI_INDIGO2 2 /* The Indigo2 system */ -#define GROUP_SGI_NAMES { "Indy" } +#define GROUP_SGI_NAMES { "Indy", "Challenge S", "Indigo2" } /* * Valid machtype for group COBALT diff --git a/include/asm-mips64/bootinfo.h b/include/asm-mips64/bootinfo.h index f62ec0e2f..dadcc4872 100644 --- a/include/asm-mips64/bootinfo.h +++ b/include/asm-mips64/bootinfo.h @@ -89,9 +89,12 @@ * Valid machtype for group SGI */ #define MACH_SGI_INDY 0 /* R4?K and R5K Indy workstaions */ -#define MACH_SGI_IP27 1 /* Origin 200, Origin 2000, Onyx 2 */ +#define MACH_SGI_CHALLENGE_S 1 /* The Challenge S server */ +#define MACH_SGI_INDIGO2 2 /* The Indigo2 system */ +#define MACH_SGI_IP27 3 /* Origin 200, Origin 2000, Onyx 2 */ + +#define GROUP_SGI_NAMES { "Indy", "Challenge S", "Indigo2", "IP27" } -#define GROUP_SGI_NAMES { "Indy", "IP27" } /* * Valid machtype for group COBALT |