summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2008-06-17 17:45:27 -0500
committerKim Phillips <kim.phillips@freescale.com>2008-06-25 16:34:29 -0500
commit4890246a2c5df90a74e2941e3673a49bbd36aee9 (patch)
tree53ac8c61947f07317ab21df64bdc01a49cd2c33c
parent914f58c5766860373a7d232e961cee5a4b54a55b (diff)
downloadblackbird-obmc-uboot-4890246a2c5df90a74e2941e3673a49bbd36aee9.tar.gz
blackbird-obmc-uboot-4890246a2c5df90a74e2941e3673a49bbd36aee9.zip
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>
-rw-r--r--cpu/mpc83xx/cpu.c1
-rw-r--r--include/asm-ppc/processor.h7
2 files changed, 7 insertions, 1 deletions
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;
OpenPOWER on IntegriCloud