diff options
author | Wolfgang Denk <wd@denx.de> | 2006-12-24 01:30:04 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2006-12-24 01:30:04 +0100 |
commit | bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea (patch) | |
tree | bcb2fa6abc6e2b2ed36a06cd77bb7f869abbe92f /cpu/mpc8260/cpu.c | |
parent | 1b3c360c235dc684ec06c2d5f183f0a282ce45e2 (diff) | |
parent | fa23044564091f05d9695beb7b5b9a931e7f41a4 (diff) | |
download | u-boot-imx-bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea.zip u-boot-imx-bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea.tar.gz u-boot-imx-bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea.tar.bz2 |
Merge with /home/hs/TQ/u-boot-dev
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 |