Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-03 01:50:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mpc86xx'

Browse source
This commit is contained in:
Jon Loeliger 2006-09-14 08:41:07 -05:00
commit b440d0ef72
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cpu/mpc86xx/cpu.c
View file

@ -76,11 +76,12 @@ checkcpu(void)
puts(" System: "); puts(" System: ");
switch (ver) { switch (ver) {
case SVR_8641: case SVR_8641:
puts("8641"); if (SVR_SUBVER(svr) == 1) {
break;
case SVR_8641D:
puts("8641D"); puts("8641D");
break; } else {
puts("8641");
}
break;
default: default:
puts("Unknown"); puts("Unknown");
break; break;

5
include/asm-ppc/processor.h
View file

@ -806,6 +806,8 @@
#define SVR_VER(svr) (((svr) >> 16) & 0xFFFF) /* Version field */ #define SVR_VER(svr) (((svr) >> 16) & 0xFFFF) /* Version field */
#define SVR_REV(svr) (((svr) >> 0) & 0xFFFF) /* Revison field */ #define SVR_REV(svr) (((svr) >> 0) & 0xFFFF) /* Revison field */
#define SVR_SUBVER(svr) (((svr) >> 8) & 0xFF) /* Process/MFG sub-version */
#define SVR_FAM(svr) (((svr) >> 20) & 0xFFF) /* Family field */ #define SVR_FAM(svr) (((svr) >> 20) & 0xFFF) /* Family field */
#define SVR_MEM(svr) (((svr) >> 16) & 0xF) /* Member field */ #define SVR_MEM(svr) (((svr) >> 16) & 0xF) /* Member field */
@ -823,9 +825,8 @@
#define SVR_8541 0x807A #define SVR_8541 0x807A
#define SVR_8548 0x8031 #define SVR_8548 0x8031
#define SVR_8548_E 0x8039 #define SVR_8548_E 0x8039
#define SVR_8641 0x8090 #define SVR_8641 0x8090
#define SVR_8641D 0x8091
/* I am just adding a single entry for 8260 boards. I think we may be /* I am just adding a single entry for 8260 boards. I think we may be
* able to combine mbx, fads, rpxlite, bseip, and classic into a single * able to combine mbx, fads, rpxlite, bseip, and classic into a single