Use strmhz() to format clock frequencies

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c
index 8990fc60580b1dcb9437aa13a7ff53863dbadd54..877a2d0044f6dbb6c4eecf86dda1229e0da0ec3b 100644 (file)
--- a/board/mpl/common/common_util.c
+++ b/board/mpl/common/common_util.c
@@ -591,7 +591,7 @@ void video_get_info_str (int line_number, char *info)
        int i,boot;
        unsigned long pvr;
        char buf[64];
-       char tmp[16];
+       char buf1[32], buf2[32], buf3[32], buf4[32];
        char cpustr[16];
        char *s, *e, bc;
        switch (line_number)
@@ -644,11 +644,12 @@ void video_get_info_str (int line_number, char *info)
                        }
                        buf[i++]=0;
                }
-               sprintf (info," %s %s %s MHz (%lu/%lu/%lu MHz)",
+               sprintf (info," %s %s %s MHz (%s/%s/%s MHz)",
                        buf, cpustr,
-                       strmhz (tmp, gd->cpu_clk), sys_info.freqPLB / 1000000,
-                       sys_info.freqPLB / sys_info.pllOpbDiv / 1000000,
-                       sys_info.freqPLB / sys_info.pllExtBusDiv / 1000000);
+                       strmhz (buf1, gd->cpu_clk),
+                       strmhz (buf2, sys_info.freqPLB),
+                       strmhz (buf3, sys_info.freqPLB / sys_info.pllOpbDiv),
+                       strmhz (buf4, sys_info.freqPLB / sys_info.pllExtBusDiv));
                return;
        case 3:
                /* Memory Info */

diff --git a/board/sbc8560/sbc8560.c b/board/sbc8560/sbc8560.c
index 413926d1f53e0f8cbdcf7242a2e5dbd39c1580d4..f01f87e1a242ef1603dd573014cbe470a6823182 100644 (file)
--- a/board/sbc8560/sbc8560.c
+++ b/board/sbc8560/sbc8560.c
@@ -238,6 +238,7 @@ void reset_phy (void)
 int checkboard (void)
 {
        sys_info_t sysinfo;
+       char buf[32];
 
        get_sys_info (&sysinfo);
 
@@ -246,16 +247,17 @@ int checkboard (void)
 #else
        printf ("Board: Wind River SBC8540 Board\n");
 #endif
-       printf ("\tCPU: %lu MHz\n", sysinfo.freqProcessor / 1000000);
-       printf ("\tCCB: %lu MHz\n", sysinfo.freqSystemBus / 1000000);
-       printf ("\tDDR: %lu MHz\n", sysinfo.freqSystemBus / 2000000);
+       printf ("\tCPU: %s MHz\n", strmhz(buf, sysinfo.freqProcessor));
+       printf ("\tCCB: %s MHz\n", strmhz(buf, sysinfo.freqSystemBus));
+       printf ("\tDDR: %s MHz\n", strmhz(buf, sysinfo.freqSystemBus/2));
        if((CONFIG_SYS_LBC_LCRR & 0x0f) == 2 || (CONFIG_SYS_LBC_LCRR & 0x0f) == 4 \
                || (CONFIG_SYS_LBC_LCRR & 0x0f) == 8) {
-               printf ("\tLBC: %lu MHz\n", sysinfo.freqSystemBus / 1000000 /(CONFIG_SYS_LBC_LCRR & 0x0f));
+               printf ("\tLBC: %s MHz\n",
+                       strmhz(buf, sysinfo.freqSystemBus/(CONFIG_SYS_LBC_LCRR & 0x0f)));
        } else {
                printf("\tLBC: unknown\n");
        }
-       printf("\tCPM: %lu Mhz\n", sysinfo.freqSystemBus / 1000000);
+       printf("\tCPM: %s MHz\n", strmhz(buf, sysinfo.freqSystemBus));
        printf("L1 D-cache 32KB, L1 I-cache 32KB enabled.\n");
        return (0);
 }

diff --git a/cpu/mcf5227x/cpu.c b/cpu/mcf5227x/cpu.c
index 5792a1c08c92787656e1da0c5eefd41135a5e884..765aec639a98304b17034da9cc967cb3411e45f0 100644 (file)
--- a/cpu/mcf5227x/cpu.c
+++ b/cpu/mcf5227x/cpu.c
@@ -60,15 +60,17 @@ int checkcpu(void)
        }
 
        if (id) {
+               char buf1[32], buf2[32], buf3[32];
+
                printf("Freescale MCF%d (Mask:%01x Version:%x)\n", id, msk,
                       ver);
-               printf("       CPU CLK %d Mhz BUS CLK %d Mhz FLB CLK %d Mhz\n",
-                      (int)(gd->cpu_clk / 1000000),
-                      (int)(gd->bus_clk / 1000000),
-                      (int)(gd->flb_clk / 1000000));
-               printf("       INP CLK %d Mhz VCO CLK %d Mhz\n",
-                      (int)(gd->inp_clk / 1000000),
-                      (int)(gd->vco_clk / 1000000));
+               printf("       CPU CLK %s MHz BUS CLK %s MHz FLB CLK %s MHz\n",
+                      strmhz(buf1, gd->cpu_clk)),
+                      strmhz(buf2, gd->bus_clk)),
+                      strmhz(buf3, gd->flb_clk)));
+               printf("       INP CLK %s MHz VCO CLK %s MHz\n",
+                      strmhz(buf1, gd->inp_clk)),
+                      strmhz(buf2, gd->vco_clk)));
        }
 
        return 0;

diff --git a/cpu/mcf523x/cpu.c b/cpu/mcf523x/cpu.c
index 1ce90fd15efb953eaf06ce2d1136356b3266af2b..b9e48aa433fdf9e3d32c0dae5d1dbd667f6203a9 100644 (file)
--- a/cpu/mcf523x/cpu.c
+++ b/cpu/mcf523x/cpu.c
@@ -60,11 +60,13 @@ int checkcpu(void)
        }
 
        if (id) {
+               char buf1[32], buf2[32];
+
                printf("Freescale MCF%d (Mask:%01x Version:%x)\n", id, msk,
                       ver);
-               printf("       CPU CLK %d Mhz BUS CLK %d Mhz\n",
-                      (int)(gd->cpu_clk / 1000000),
-                      (int)(gd->bus_clk / 1000000));
+               printf("       CPU CLK %s MHz BUS CLK %s MHz\n",
+                      strmhz(buf1, gd->cpu_clk)),
+                      strmhz(buf2, gd->bus_clk)));
        }
 
        return 0;

diff --git a/cpu/mcf532x/cpu.c b/cpu/mcf532x/cpu.c
index 8c496a2a2ae4e6b44862d307cda69dfd8802c936..fd77939f24b89b99522c5a652cb5b67120f708f0 100644 (file)
--- a/cpu/mcf532x/cpu.c
+++ b/cpu/mcf532x/cpu.c
@@ -80,11 +80,13 @@ int checkcpu(void)
        }
 
        if (id) {
+               char buf1[32], buf2[32];
+
                printf("Freescale MCF%d (Mask:%01x Version:%x)\n", id, msk,
                       ver);
-               printf("       CPU CLK %d Mhz BUS CLK %d Mhz\n",
-                      (int)(gd->cpu_clk / 1000000),
-                      (int)(gd->bus_clk / 1000000));
+               printf("       CPU CLK %s MHz BUS CLK %s MHz\n",
+                      strmhz(buf1, gd->cpu_clk)),
+                      strmhz(buf2, gd->bus_clk)));
        }
 
        return 0;

diff --git a/cpu/mcf5445x/cpu.c b/cpu/mcf5445x/cpu.c
index a30c327dd76690a5c90215ce672edb285b7f7843..6238bc020fe821a0cbfcb8d761dac78cc8b05d18 100644 (file)
--- a/cpu/mcf5445x/cpu.c
+++ b/cpu/mcf5445x/cpu.c
@@ -76,21 +76,23 @@ int checkcpu(void)
        }
 
        if (id) {
+               char buf1[32], buf2[32], buf3[32];
+
                printf("Freescale MCF%d (Mask:%01x Version:%x)\n", id, msk,
                       ver);
-               printf("       CPU CLK %d Mhz BUS CLK %d Mhz FLB CLK %d Mhz\n",
-                      (int)(gd->cpu_clk / 1000000),
-                      (int)(gd->bus_clk / 1000000),
-                      (int)(gd->flb_clk / 1000000));
+               printf("       CPU CLK %s MHz BUS CLK %s MHz FLB CLK %s MHz\n",
+                      strmhz(buf1, gd->cpu_clk),
+                      strmhz(buf2, gd->bus_clk),
+                      strmhz(buf3, gd->flb_clk));
 #ifdef CONFIG_PCI
-               printf("       PCI CLK %d Mhz INP CLK %d Mhz VCO CLK %d Mhz\n",
-                      (int)(gd->pci_clk / 1000000),
-                      (int)(gd->inp_clk / 1000000),
-                      (int)(gd->vco_clk / 1000000));
+               printf("       PCI CLK %s MHz INP CLK %s MHz VCO CLK %s MHz\n",
+                      strmhz(buf1, gd->pci_clk),
+                      strmhz(buf2, gd->inp_clk),
+                      strmhz(buf3, gd->vco_clk));
 #else
-               printf("       INP CLK %d Mhz VCO CLK %d Mhz\n",
-                      (int)(gd->inp_clk / 1000000),
-                      (int)(gd->vco_clk / 1000000));
+               printf("       INP CLK %s MHz VCO CLK %s MHz\n",
+                      strmhz(buf1, gd->inp_clk),
+                      strmhz(buf2, gd->vco_clk));
 #endif
        }
 

diff --git a/cpu/mcf547x_8x/cpu.c b/cpu/mcf547x_8x/cpu.c
index f9a3544dd6d82e6f549dc5a7021d1351d486ffc9..3912a74d5f8f74ac388ab5306649e6b0b53d87c4 100644 (file)
--- a/cpu/mcf547x_8x/cpu.c
+++ b/cpu/mcf547x_8x/cpu.c
@@ -96,10 +96,12 @@ int checkcpu(void)
        }
 
        if (id) {
+               char buf1[32], buf2[32];
+
                printf("Freescale MCF%d\n", id);
-               printf("       CPU CLK %d Mhz BUS CLK %d Mhz\n",
-                      (int)(gd->cpu_clk / 1000000),
-                      (int)(gd->bus_clk / 1000000));
+               printf("       CPU CLK %s MHz BUS CLK %s MHz\n",
+                      strmhz(buf1, gd->cpu_clk),
+                      strmhz(buf2, gd->bus_clk));
        }
 
        return 0;

diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c
index 9b5973803dbe47bd802f6afdd71f3606e7a83f3c..b9069b065e7ec6222f6f279d56252b8567a6e6a0 100644 (file)
--- a/cpu/mpc512x/cpu.c
+++ b/cpu/mpc512x/cpu.c
@@ -45,7 +45,7 @@ int checkcpu (void)
        ulong clock = gd->cpu_clk;
        u32 pvr = get_pvr ();
        u32 spridr = immr->sysconf.spridr;
-       char buf[32];
+       char buf1[32], buf2[32];
 
        puts ("CPU:   ");
 
@@ -65,8 +65,9 @@ int checkcpu (void)
        default:
                puts ("unknown ");
        }
-       printf ("at %s MHz, CSB at %3d MHz\n", strmhz(buf, clock),
-               gd->csb_clk / 1000000);
+       printf ("at %s MHz, CSB at %s MHz\n",
+               strmhz(buf1, clock),
+               strmhz(buf2, gd->csb_clk) );
        return 0;
 }
 

diff --git a/cpu/mpc512x/speed.c b/cpu/mpc512x/speed.c
index baf6215418f5726dbcdd337f029c8165df6a1498..542bf21c7742e5179a02ce467e4ce3eb10c2bf73 100644 (file)
--- a/cpu/mpc512x/speed.c
+++ b/cpu/mpc512x/speed.c
@@ -125,12 +125,14 @@ ulong get_bus_freq (ulong dummy)
 
 int do_clocks (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
+       char buf[32];
+
        printf("Clock configuration:\n");
-       printf("  CPU:                 %4ld MHz\n", gd->cpu_clk / 1000000);
-       printf("  Coherent System Bus: %4d MHz\n", gd->csb_clk / 1000000);
-       printf("  IPS Bus:             %4d MHz\n", gd->ips_clk / 1000000);
-       printf("  PCI:                 %4d MHz\n", gd->pci_clk / 1000000);
-       printf("  DDR:                 %4d MHz\n", 2 * gd->csb_clk / 1000000);
+       printf("  CPU:                 %-4s MHz\n", strmhz(buf, gd->cpu_clk));
+       printf("  Coherent System Bus: %-4s MHz\n", strmhz(buf, gd->csb_clk));
+       printf("  IPS Bus:             %-4s MHz\n", strmhz(buf, gd->ips_clk));
+       printf("  PCI:                 %-4s MHz\n", strmhz(buf, gd->pci_clk));
+       printf("  DDR:                 %-4s MHz\n", strmhz(buf, 2*gd->csb_clk));
        return 0;
 }
 

diff --git a/cpu/mpc5xxx/speed.c b/cpu/mpc5xxx/speed.c
index 0e3e5525fd3de22514a57cb71b1c6f422d9225a5..8027d3e08a2c8054a97bbcd00d0200389fccdfa0 100644 (file)
--- a/cpu/mpc5xxx/speed.c
+++ b/cpu/mpc5xxx/speed.c
@@ -81,10 +81,13 @@ int get_clocks (void)
 
 int prt_mpc5xxx_clks (void)
 {
-       printf("       Bus %ld MHz, IPB %ld MHz, PCI %ld MHz\n",
-                       gd->bus_clk / 1000000, gd->ipb_clk / 1000000,
-                       gd->pci_clk / 1000000);
+       char buf1[32], buf2[32], buf3[32];
 
+       printf ("       Bus %s MHz, IPB %s MHz, PCI %s MHz\n",
+               strmhz(buf1, gd->bus_clk),
+               strmhz(buf2, gd->ipb_clk),
+               strmhz(buf3, gd->pci_clk)
+       );
        return (0);
 }
 

diff --git a/cpu/mpc8220/speed.c b/cpu/mpc8220/speed.c
index c01ca0cd5eafaee096c64bd7b54453a17178423c..62ac845b7ae8f1aacfae45e623faa404eded5dbf 100644 (file)
--- a/cpu/mpc8220/speed.c
+++ b/cpu/mpc8220/speed.c
@@ -109,10 +109,14 @@ int get_clocks (void)
 
 int prt_mpc8220_clks (void)
 {
-       printf ("       Bus %ld MHz, CPU %ld MHz, PCI %ld MHz, VCO %ld MHz\n",
-               gd->bus_clk / 1000000, gd->cpu_clk / 1000000,
-               gd->pci_clk / 1000000, gd->vco_clk / 1000000);
-
+       char buf1[32], buf2[32], buf3[32], buf4[32];
+
+       printf ("       Bus %s MHz, CPU %s MHz, PCI %s MHz, VCO %s MHz\n",
+               strmhz(buf1, gd->bus_clk),
+               strmhz(buf2, gd->cpu_clk),
+               strmhz(buf3, gd->pci_clk),
+               strmhz(buf4, gd->vco_clk)
+       );
        return (0);
 }
 

diff --git a/cpu/mpc83xx/speed.c b/cpu/mpc83xx/speed.c
index 3a708d8544142cfedb4f99428cfd85b59f418e50..bf9bf36e5f1766ffc65f3056a13e4b069ee41e3c 100644 (file)
--- a/cpu/mpc83xx/speed.c
+++ b/cpu/mpc83xx/speed.c
@@ -499,44 +499,46 @@ ulong get_bus_freq(ulong dummy)
 
 int do_clocks (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
+       char buf[32];
+
        printf("Clock configuration:\n");
-       printf("  Core:                %4d MHz\n", gd->core_clk / 1000000);
-       printf("  Coherent System Bus: %4d MHz\n", gd->csb_clk / 1000000);
+       printf("  Core:                %-4s MHz\n", strmhz(buf, gd->core_clk));
+       printf("  Coherent System Bus: %-4s MHz\n", strmhz(buf, gd->csb_clk));
 #if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832X)
-       printf("  QE:                  %4d MHz\n", gd->qe_clk / 1000000);
-       printf("  BRG:                 %4d MHz\n", gd->brg_clk / 1000000);
+       printf("  QE:                  %-4s MHz\n", strmhz(buf, gd->qe_clk));
+       printf("  BRG:                 %-4s MHz\n", strmhz(buf, gd->brg_clk));
 #endif
-       printf("  Local Bus Controller:%4d MHz\n", gd->lbiu_clk / 1000000);
-       printf("  Local Bus:           %4d MHz\n", gd->lclk_clk / 1000000);
-       printf("  DDR:                 %4ld MHz\n", gd->mem_clk / 1000000);
+       printf("  Local Bus Controller:%-4s MHz\n", strmhz(buf, gd->lbiu_clk));
+       printf("  Local Bus:           %-4s MHz\n", strmhz(buf, gd->lclk_clk));
+       printf("  DDR:                 %-4s MHz\n", strmhz(buf, gd->mem_clk));
 #if defined(CONFIG_MPC8360)
-       printf("  DDR Secondary:       %4d MHz\n", gd->mem_sec_clk / 1000000);
+       printf("  DDR Secondary:       %-4s MHz\n", strmhz(buf, gd->mem_sec_clk));
 #endif
-       printf("  SEC:                 %4d MHz\n", gd->enc_clk / 1000000);
-       printf("  I2C1:                %4d MHz\n", gd->i2c1_clk / 1000000);
+       printf("  SEC:                 %-4s MHz\n", strmhz(buf, gd->enc_clk));
+       printf("  I2C1:                %-4s MHz\n", strmhz(buf, gd->i2c1_clk));
 #if !defined(CONFIG_MPC832X)
-       printf("  I2C2:                %4d MHz\n", gd->i2c2_clk / 1000000);
+       printf("  I2C2:                %-4s MHz\n", strmhz(buf, gd->i2c2_clk));
 #endif
 #if defined(CONFIG_MPC8315)
-       printf("  TDM:                 %4d MHz\n", gd->tdm_clk / 1000000);
+       printf("  TDM:                 %-4s MHz\n", strmhz(buf, gd->tdm_clk));
 #endif
 #if defined(CONFIG_MPC837X)
-       printf("  SDHC:                %4d MHz\n", gd->sdhc_clk / 1000000);
+       printf("  SDHC:                %-4s MHz\n", strmhz(buf, gd->sdhc_clk));
 #endif
 #if defined(CONFIG_MPC834X) || defined(CONFIG_MPC831X) || defined(CONFIG_MPC837X)
-       printf("  TSEC1:               %4d MHz\n", gd->tsec1_clk / 1000000);
-       printf("  TSEC2:               %4d MHz\n", gd->tsec2_clk / 1000000);
-       printf("  USB DR:              %4d MHz\n", gd->usbdr_clk / 1000000);
+       printf("  TSEC1:               %-4s MHz\n", strmhz(buf, gd->tsec1_clk));
+       printf("  TSEC2:               %-4s MHz\n", strmhz(buf, gd->tsec2_clk));
+       printf("  USB DR:              %-4s MHz\n", strmhz(buf, gd->usbdr_clk));
 #endif
 #if defined(CONFIG_MPC834X)
-       printf("  USB MPH:             %4d MHz\n", gd->usbmph_clk / 1000000);
+       printf("  USB MPH:             %-4s MHz\n", strmhz(buf, gd->usbmph_clk));
 #endif
 #if defined(CONFIG_MPC837X)
-       printf("  PCIEXP1:             %4d MHz\n", gd->pciexp1_clk / 1000000);
-       printf("  PCIEXP2:             %4d MHz\n", gd->pciexp2_clk / 1000000);
+       printf("  PCIEXP1:             %-4s MHz\n", strmhz(buf, gd->pciexp1_clk));
+       printf("  PCIEXP2:             %-4s MHz\n", strmhz(buf, gd->pciexp2_clk));
 #endif
 #if defined(CONFIG_MPC837X) || defined(CONFIG_MPC8315)
-       printf("  SATA:                %4d MHz\n", gd->sata_clk / 1000000);
+       printf("  SATA:                %-4s MHz\n", strmhz(buf, gd->sata_clk));
 #endif
        return 0;
 }

diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c
index 9c4f2145025f8d2d12004006075a40e0775b5fb4..b8f9125c73be1a0698a83b44e4966c14179de331 100644 (file)
--- a/cpu/mpc85xx/cpu.c
+++ b/cpu/mpc85xx/cpu.c
@@ -83,6 +83,7 @@ int checkcpu (void)
        uint ver;
        uint major, minor;
        struct cpu_type *cpu;
+       char buf1[32], buf2[32];
 #ifdef CONFIG_DDR_CLK_FREQ
        volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
        u32 ddr_ratio = ((gur->porpllsr) & MPC85xx_PORPLLSR_DDR_RATIO)
@@ -138,21 +139,24 @@ int checkcpu (void)
        get_sys_info(&sysinfo);
 
        puts("Clock Configuration:\n");
-       printf("       CPU:%4lu MHz, ", DIV_ROUND_UP(sysinfo.freqProcessor,1000000));
-       printf("CCB:%4lu MHz,\n", DIV_ROUND_UP(sysinfo.freqSystemBus,1000000));
+       printf("       CPU:%-4s MHz, ", strmhz(buf1, sysinfo.freqProcessor));
+       printf("CCB:%-4s MHz,\n", strmhz(buf1, sysinfo.freqSystemBus));
 
        switch (ddr_ratio) {
        case 0x0:
-               printf("       DDR:%4lu MHz (%lu MT/s data rate), ",
-               DIV_ROUND_UP(sysinfo.freqDDRBus,2000000), DIV_ROUND_UP(sysinfo.freqDDRBus,1000000));
+               printf("       DDR:%-4s MHz (%s MT/s data rate), ",
+                       strmhz(buf1, sysinfo.freqDDRBus/2),
+                       strmhz(buf2, sysinfo.freqDDRBus));
                break;
        case 0x7:
-               printf("       DDR:%4lu MHz (%lu MT/s data rate) (Synchronous), ",
-               DIV_ROUND_UP(sysinfo.freqDDRBus, 2000000), DIV_ROUND_UP(sysinfo.freqDDRBus, 1000000));
+               printf("       DDR:%-4s MHz (%s MT/s data rate) (Synchronous), ",
+                       strmhz(buf1, sysinfo.freqDDRBus/2),
+                       strmhz(buf2, sysinfo.freqDDRBus));
                break;
        default:
-               printf("       DDR:%4lu MHz (%lu MT/s data rate) (Asynchronous), ",
-               DIV_ROUND_UP(sysinfo.freqDDRBus, 2000000), DIV_ROUND_UP(sysinfo.freqDDRBus,1000000));
+               printf("       DDR:%-4s MHz (%s MT/s data rate) (Asynchronous), ",
+                       strmhz(buf1, sysinfo.freqDDRBus/2),
+                       strmhz(buf2, sysinfo.freqDDRBus));
                break;
        }
 
@@ -175,14 +179,14 @@ int checkcpu (void)
                 */
                 clkdiv *= 2;
 #endif
-               printf("LBC:%4lu MHz\n",
-                      DIV_ROUND_UP(sysinfo.freqSystemBus, 1000000) / clkdiv);
+               printf("LBC:%-4s MHz\n",
+                      strmhz(buf1, sysinfo.freqSystemBus / clkdiv));
        } else {
                printf("LBC: unknown (lcrr: 0x%08x)\n", lcrr);
        }
 
 #ifdef CONFIG_CPM2
-       printf("CPM:   %lu Mhz\n", sysinfo.freqSystemBus / 1000000);
+       printf("CPM:   %s MHz\n", strmhz(buf1, sysinfo.freqSystemBus));
 #endif
 
        puts("L1:    D-cache 32 kB enabled\n       I-cache 32 kB enabled\n");