Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b56fd8c authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Ralf Baechle
Browse files

[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: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c6607295

arch/mips/emma2rh/common/prom.c

+7 −8
Original line number Diff line number Diff line
@@ -34,12 +34,11 @@ 


const char *get_system_type(void)

{

	switch (mips_machtype) {

	case MACH_NEC_MARKEINS:

#if defined(CONFIG_MARKEINS)

	return "NEC EMMA2RH Mark-eins";

	default:

		return "Unknown NEC board";

	}

#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)

include/asm-mips/bootinfo.h

+0 −5
Original line number Diff line number Diff line
@@ -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

 */