From b75ef85f42f75206a9a2c278c042e911c92ea28c Mon Sep 17 00:00:00 2001 From: Marian Balakowicz Date: Tue, 9 May 2006 11:45:31 +0200 Subject: Update CPU target identification strings for Coldfire family. --- CHANGELOG | 2 ++ cpu/mcf52x2/cpu.c | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d4a35caf5c..1b44e706b4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Changes since U-Boot 1.1.4: ====================================================================== +* Update CPU target identification strings for Coldfire family. + * Update register definitions for MCF5271. * Fix serial console support for MCF5271. diff --git a/cpu/mcf52x2/cpu.c b/cpu/mcf52x2/cpu.c index 302832bd43..e6e5d9bee9 100644 --- a/cpu/mcf52x2/cpu.c +++ b/cpu/mcf52x2/cpu.c @@ -46,7 +46,9 @@ #ifdef CONFIG_M5271 int checkcpu (void) { - puts ("CPU: MOTOROLA Coldfire MCF5271\n"); + char buf[32]; + + printf ("CPU: Freescale Coldfire MCF5271 at %s MHz\n", strmhz(buf, CFG_CLK)); return 0; } @@ -71,7 +73,6 @@ int watchdog_disable (void) int watchdog_init (void) { - mbar_writeShort(MCF_WTM_WCNTR, CONFIG_WATCHDOG_TIMEOUT); mbar_writeShort(MCF_WTM_WCR, MCF_WTM_WCR_EN); return (0); } @@ -106,12 +107,12 @@ int checkcpu(void) { case 0x4: suf = "3K75N"; break; default: suf = NULL; - printf ("MOTOROLA MCF5272 (Mask:%01x)\n", msk); + printf ("Freescale MCF5272 (Mask:%01x)\n", msk); break; } if (suf) - printf ("MOTOROLA MCF5272 %s\n", suf); + printf ("Freescale MCF5272 %s\n", suf); return 0; }; @@ -157,7 +158,7 @@ int watchdog_init (void) #ifdef CONFIG_M5282 int checkcpu (void) { - puts ("CPU: MOTOROLA Coldfire MCF5282\n"); + puts ("CPU: Freescale Coldfire MCF5282\n"); return 0; } @@ -171,7 +172,7 @@ int checkcpu (void) { char buf[32]; - printf ("CPU: MOTOROLA Coldfire MCF5249 at %s MHz\n", strmhz(buf, CFG_CLK)); + printf ("CPU: Freescale Coldfire MCF5249 at %s MHz\n", strmhz(buf, CFG_CLK)); return 0; } -- cgit v1.2.1