dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[MIPS] Remove mips_machtype from EMMA2RH machines 

This is the EMMA2RH part of the mips_machtype removal.

[Ralf: Fixed to the #error statements]

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Thomas Bogendoerfer 2008-07-14 15:54:30 +02:00 committed by Ralf Baechle
parent c660729501
commit 0b56fd8c7a
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/mips/emma2rh/common/prom.c
View File

@ -34,12 +34,11 @@
const char *get_system_type(void)
{
switch (mips_machtype) {
case MACH_NEC_MARKEINS:
return "NEC EMMA2RH Mark-eins";
default:
return "Unknown NEC board";
}
#if defined(CONFIG_MARKEINS)
return "NEC EMMA2RH Mark-eins";
#else
#error Unknown NEC board
#endif
}
/* [jsun@junsun.net] PMON passes arguments in C main() style */
@ -63,10 +62,10 @@ void __init prom_init(void)
}
#if defined(CONFIG_MARKEINS)
mips_machtype = MACH_NEC_MARKEINS;
add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);
#else
#error Unknown NEC board
#endif
}
void __init prom_free_prom_memory(void)

5
include/asm-mips/bootinfo.h
View File

@ -46,11 +46,6 @@
#define MACH_LASAT_100 0 /* Masquerade II/SP100/SP50/SP25 */
#define MACH_LASAT_200 1 /* Masquerade PRO/SP200 */
/*
* Valid machtype for group NEC EMMA2RH
*/
#define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */
/*
* Valid machtype for group PMC-MSP
*/