diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2007-01-04 11:10:05 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-01-04 11:10:05 +0800 |
| commit | a41969e09b9d886091a804c2ba5f1ab84b084dd3 (patch) | |
| tree | 96d4b03713537e6c0a696e4770c23f9d39792666 /cpu/mpc8260/cpu.c | |
| parent | d3bb5ec198edad4869ac5276a5899881b7bf5433 (diff) | |
| parent | 92eb729bad876725aeea908d2addba0800620840 (diff) | |
| download | u-boot-imx-a41969e09b9d886091a804c2ba5f1ab84b084dd3.zip u-boot-imx-a41969e09b9d886091a804c2ba5f1ab84b084dd3.tar.gz u-boot-imx-a41969e09b9d886091a804c2ba5f1ab84b084dd3.tar.bz2 | |
Merge branch 'master' into hpc2
Diffstat (limited to 'cpu/mpc8260/cpu.c')
| -rw-r--r-- | cpu/mpc8260/cpu.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c index 4f23012..94651dc 100644 --- a/cpu/mpc8260/cpu.c +++ b/cpu/mpc8260/cpu.c @@ -49,6 +49,10 @@ DECLARE_GLOBAL_DATA_PTR; +#if defined(CONFIG_GET_CPU_STR_F) +extern int get_cpu_str_f (char *buf); +#endif + int checkcpu (void) { volatile immap_t *immap = (immap_t *) CFG_IMMR; @@ -81,7 +85,12 @@ int checkcpu (void) if ((immr & IMMR_ISB_MSK) != CFG_IMMR) return -1; /* whoops! someone moved the IMMR */ +#if defined(CONFIG_GET_CPU_STR_F) + get_cpu_str_f (buf); + printf ("%s (HiP%d Rev %02x, Mask ", buf, k, rev); +#else printf (CPU_ID_STR " (HiP%d Rev %02x, Mask ", k, rev); +#endif /* * the bottom 16 bits of the immr are the Part Number and Mask Number |