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 --- cpu/mpc83xx/cpu.c | 1 - include/asm-ppc/processor.h | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index 36de78d..cc03f8a 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 4bfd9f9..cf44f4f 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -979,8 +979,15 @@ struct cpu_type {
struct cpu_type *identify_cpu(uint 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;