summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-07 00:33:07 +0200
committerWolfgang Denk <wd@denx.de>2008-07-07 00:33:07 +0200
commitb0f1c03607b7c1ea07090a1d97a308fba901051d (patch)
tree69aea3c0d693473ef2268fdadb94f6d4d6e50e74 /include
parent9047bfa1e737d787be460387dd6f45737eeceb10 (diff)
parent3070a9a3cb41ed6b19f79590f7713d5685ab1066 (diff)
downloadu-boot-imx-b0f1c03607b7c1ea07090a1d97a308fba901051d.zip
u-boot-imx-b0f1c03607b7c1ea07090a1d97a308fba901051d.tar.gz
u-boot-imx-b0f1c03607b7c1ea07090a1d97a308fba901051d.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc/processor.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index 5b50679..10fd478 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;