summaryrefslogtreecommitdiff
path: root/include/asm-ppc
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-07 00:32:47 +0200
committerWolfgang Denk <wd@denx.de>2008-07-07 00:32:47 +0200
commit3070a9a3cb41ed6b19f79590f7713d5685ab1066 (patch)
tree2d69ea08d00d228dac08992180c421defee3105b /include/asm-ppc
parent9fea65a6c469b1b474b27446feb58738baba2d31 (diff)
parentf16ed51702cb9fb6fa2e019bbc0fcd1466b57c3b (diff)
downloadu-boot-imx-3070a9a3cb41ed6b19f79590f7713d5685ab1066.zip
u-boot-imx-3070a9a3cb41ed6b19f79590f7713d5685ab1066.tar.gz
u-boot-imx-3070a9a3cb41ed6b19f79590f7713d5685ab1066.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Diffstat (limited to 'include/asm-ppc')
-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;