diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-09-14 08:41:07 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-09-14 08:41:07 -0500 |
| commit | b440d0ef72e6278973d3220c10136a4c0624c286 (patch) | |
| tree | 665d650fda659f27c8c1f3d6d1e9ae08b08ef7f8 | |
| parent | 0855c50e6509d03ce2af1e9c4d1dc09ba426faa5 (diff) | |
| parent | d14ba6a798beb753e7a864500414fcc2d198b8bc (diff) | |
| download | u-boot-imx-b440d0ef72e6278973d3220c10136a4c0624c286.zip u-boot-imx-b440d0ef72e6278973d3220c10136a4c0624c286.tar.gz u-boot-imx-b440d0ef72e6278973d3220c10136a4c0624c286.tar.bz2 | |
Merge branch 'mpc86xx'
| -rw-r--r-- | cpu/mpc86xx/cpu.c | 9 | ||||
| -rw-r--r-- | include/asm-ppc/processor.h | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c index ddd0ad3..551b243 100644 --- a/cpu/mpc86xx/cpu.c +++ b/cpu/mpc86xx/cpu.c @@ -76,11 +76,12 @@ checkcpu(void) puts(" System: "); switch (ver) { case SVR_8641: - puts("8641"); - break; - case SVR_8641D: + if (SVR_SUBVER(svr) == 1) { puts("8641D"); - break; + } else { + puts("8641"); + } + break; default: puts("Unknown"); break; diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 6e1d610..e52d4b9 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -806,6 +806,8 @@ #define SVR_VER(svr) (((svr) >> 16) & 0xFFFF) /* Version 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_MEM(svr) (((svr) >> 16) & 0xF) /* Member field */ @@ -823,9 +825,8 @@ #define SVR_8541 0x807A #define SVR_8548 0x8031 #define SVR_8548_E 0x8039 - #define SVR_8641 0x8090 -#define SVR_8641D 0x8091 + /* 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 |