Update CPU target identification strings for Coldfire family.

diff --git a/CHANGELOG b/CHANGELOG
index d4a35caf5c2717f0446d15fb4b672aafdcaf932f..1b44e706b48dbb4cb309605b353e941bfe95b721 100644 (file)
--- 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 302832bd4314b39fe6d9ee18fba99016a75df4f9..e6e5d9bee963b082aa26a505818c19b1266e0970 100644 (file)
--- 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;
 }