[PATCH] Remove mips_machtype from EMMA2RH machines

[PATCH] Remove mips_machtype from EMMA2RH machines

[Thomas Bogendoerfer]

This is the EMMA2RH part of the mips_machtype removal.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---

This patch is against the queue tree.

 arch/mips/emma2rh/common/prom.c |   15 +++++++--------
 include/asm-mips/bootinfo.h     |    5 -----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma2rh/common/prom.c
index 0f791eb..38ce477 100644
--- a/arch/mips/emma2rh/common/prom.c
+++ b/arch/mips/emma2rh/common/prom.c
@@ -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)
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index 653096a..51dbec9 100644
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -47,11 +47,6 @@
 #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
  */
 #define MACH_MSP4200_EVAL       0	/* PMC-Sierra MSP4200 Evaluation */

Re: [PATCH] Remove mips_machtype from EMMA2RH machines

[Ralf Baechle]

On Mon, Jul 14, 2008 at 03:54:30PM +0200, Thomas Bogendoerfer wrote:

> +#error  "Unknown NEC board";

No quotes, no trailing semikolons in a #error statement - they actually
are part of the string in #error which will look like this:

$ cat c.c 
#error  "Unknown NEC board";
$ gcc -o c.o c.c
c.c:1:2: error: #error "Unknown NEC board";
$

  Ralf