From: Kim Phillips <kim.phillips@freescale.com>
Date: Tue, 17 Jun 2008 22:45:27 +0000 (-0500)
Subject: mpc83xx: move CPU_TYPE_ENTRY over to processor.h
X-Git-Tag: v1.3.4-rc1~84^2^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4890246a2c5df90a74e2941e3673a49bbd36aee9;p=u-boot

mpc83xx: move CPU_TYPE_ENTRY over to processor.h

to avoid this:

cpu.c:47:1: warning: "CPU_TYPE_ENTRY" redefined
In file included from cpu.c:33:
/home/kim/git/u-boot/include/asm/processor.h:982:1: warning: this is the location of the previous definition

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
---

diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c
index 36de78d270..cc03f8a01f 100644
--- a/cpu/mpc83xx/cpu.c
+++ b/cpu/mpc83xx/cpu.c
@@ -44,7 +44,6 @@ int checkcpu(void)
 	char buf[32];
 	int i;
 
-#define CPU_TYPE_ENTRY(x) {#x, SPR_##x}
 	const struct cpu_type {
 		char name[15];
 		u32 partid;
diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index 5b506791a7..10fd478bab 100644
--- a/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@ -970,8 +970,15 @@ struct cpu_type {
 
 struct cpu_type *identify_cpu(u32 ver);
 
+#if defined(CONFIG_MPC85xx)
 #define CPU_TYPE_ENTRY(n, v) \
 	{ .name = #n, .soc_ver = SVR_##v, }
+#else
+#if defined(CONFIG_MPC83XX)
+#define CPU_TYPE_ENTRY(x) {#x, SPR_##x}
+#endif
+#endif
+
 
 #ifndef CONFIG_MACH_SPECIFIC
 extern int _machine;