From 664517a1dc99fe975fc3ae5f9224574ae01f4983 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 10 Jul 2007 16:56:33 +0100 Subject: [PATCH] --- yaml --- r: 58681 b: refs/heads/master c: 569fb7536ea66e3364a8ff0b26598c6c9874d657 h: refs/heads/master i: 58679: 84b9ced6b3a3f43e4807e94fd78658a8439c24b4 v: v3 --- [refs] | 2 +- trunk/arch/mips/gt64120/wrppmc/setup.c | 4 ++-- trunk/include/asm-mips/bootinfo.h | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b08d028919ed..4754f2c8966c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44659f29a0a26dcdbf516a82b0ff96d6ba464724 +refs/heads/master: 569fb7536ea66e3364a8ff0b26598c6c9874d657 diff --git a/trunk/arch/mips/gt64120/wrppmc/setup.c b/trunk/arch/mips/gt64120/wrppmc/setup.c index 121188d5ec4a..ea965529e5e0 100644 --- a/trunk/arch/mips/gt64120/wrppmc/setup.c +++ b/trunk/arch/mips/gt64120/wrppmc/setup.c @@ -158,8 +158,8 @@ const char *get_system_type(void) */ void __init prom_init(void) { - mips_machgroup = MACH_GROUP_GALILEO; - mips_machtype = MACH_EV64120A; + mips_machgroup = MACH_GROUP_WINDRIVER; + mips_machtype = MACH_WRPPMC; add_memory_region(WRPPMC_SDRAM_SCS0_BASE, WRPPMC_SDRAM_SCS0_SIZE, BOOT_MEM_RAM); add_memory_region(WRPPMC_BOOTROM_BASE, WRPPMC_BOOTROM_SIZE, BOOT_MEM_ROM_DATA); diff --git a/trunk/include/asm-mips/bootinfo.h b/trunk/include/asm-mips/bootinfo.h index 075a4d3de326..087126a5faf9 100644 --- a/trunk/include/asm-mips/bootinfo.h +++ b/trunk/include/asm-mips/bootinfo.h @@ -218,6 +218,9 @@ #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */ #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */ +#define MACH_GROUP_WINDRIVER 28 /* Windriver boards */ +#define MACH_WRPPMC 1 + #define CL_SIZE COMMAND_LINE_SIZE const char *get_system_type(void);