projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'next' branch
[oweals/u-boot.git]
/
cpu
/
nios
/
cpu.c
diff --git
a/cpu/nios/cpu.c
b/cpu/nios/cpu.c
index 5cf1883bc5371f41c230e2d9eb7feae53250ac17..5519e827804950dc4e4496bcbe0f91aef9120e78 100644
(file)
--- a/
cpu/nios/cpu.c
+++ b/
cpu/nios/cpu.c
@@
-34,11
+34,11
@@
int checkcpu (void)
/* Get cpu version info */
val = rdctl (CTL_CPU_ID);
/* Get cpu version info */
val = rdctl (CTL_CPU_ID);
- p
rintf ("CPU:
");
+ p
uts ("CPU:
");
printf ("%s", (val & 0x00008000) ? "Nios-16 " : "Nios-32 ");
rev_major = (val>>12) & 0x07;
printf ("%s", (val & 0x00008000) ? "Nios-16 " : "Nios-32 ");
rev_major = (val>>12) & 0x07;
- rev_minor =
val & 0x0
f;
- printf ("Rev. %d.%
02
d (0x%04x)", rev_major, rev_minor,
+ rev_minor =
(val>>4) & 0x0f
f;
+ printf ("Rev. %d.%d (0x%04x)", rev_major, rev_minor,
val & 0xffff);
if (rev_major == 0x08)
printf (" [OpenCore (R) Plus]");
val & 0xffff);
if (rev_major == 0x08)
printf (" [OpenCore (R) Plus]");