projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc8xx
/
cpu.c
diff --git
a/arch/powerpc/cpu/mpc8xx/cpu.c
b/arch/powerpc/cpu/mpc8xx/cpu.c
index
5c96b5f
..
eb4432f
100644
(file)
--- a/
arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/
arch/powerpc/cpu/mpc8xx/cpu.c
@@
-97,14
+97,8
@@
static int check_CPU (long clock, uint pvr, uint immr)
pre = 'M'; m = 1;
if (id_str == NULL)
id_str =
pre = 'M'; m = 1;
if (id_str == NULL)
id_str =
-# if defined(CONFIG_MPC852T)
- "PC852T";
-# elif defined(CONFIG_MPC859T)
+# if defined(CONFIG_MPC859T)
"PC859T";
"PC859T";
-# elif defined(CONFIG_MPC859DSL)
- "PC859DSL";
-# elif defined(CONFIG_MPC866T)
- "PC866T";
# else
"PC866x"; /* Unknown chip from MPC866 family */
# endif
# else
"PC866x"; /* Unknown chip from MPC866 family */
# endif