提交 0b56fd8c 编写于 作者: T Thomas Bogendoerfer 提交者: Ralf Baechle

[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: NThomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
上级 c6607295
...@@ -34,12 +34,11 @@ ...@@ -34,12 +34,11 @@
const char *get_system_type(void) const char *get_system_type(void)
{ {
switch (mips_machtype) { #if defined(CONFIG_MARKEINS)
case MACH_NEC_MARKEINS: return "NEC EMMA2RH Mark-eins";
return "NEC EMMA2RH Mark-eins"; #else
default: #error Unknown NEC board
return "Unknown NEC board"; #endif
}
} }
/* [jsun@junsun.net] PMON passes arguments in C main() style */ /* [jsun@junsun.net] PMON passes arguments in C main() style */
...@@ -63,10 +62,10 @@ void __init prom_init(void) ...@@ -63,10 +62,10 @@ void __init prom_init(void)
} }
#if defined(CONFIG_MARKEINS) #if defined(CONFIG_MARKEINS)
mips_machtype = MACH_NEC_MARKEINS;
add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM); add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);
#else
#error Unknown NEC board
#endif #endif
} }
void __init prom_free_prom_memory(void) void __init prom_free_prom_memory(void)
......
...@@ -46,11 +46,6 @@ ...@@ -46,11 +46,6 @@
#define MACH_LASAT_100 0 /* Masquerade II/SP100/SP50/SP25 */ #define MACH_LASAT_100 0 /* Masquerade II/SP100/SP50/SP25 */
#define MACH_LASAT_200 1 /* Masquerade PRO/SP200 */ #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 * Valid machtype for group PMC-MSP
*/ */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册