Consolidate strmhz() implementation

ARM, i386, m68k and ppc all have identical implementations of strmhz().
Other architectures don't provide this function at all.

This patch moves strmhz() into lib_generic, reducing code duplication
and providing a more unified API across architectures.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

diff --git a/include/common.h b/include/common.h
index 06ed27806ff261da3b1009c1c0824e8c90d655c9..de3d595ed25c5ae63d6f1a5ba42bcabcc96bd903 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -224,7 +224,6 @@ void        board_init_r  (gd_t *, ulong) __attribute__ ((noreturn));
 int    checkboard    (void);
 int    checkflash    (void);
 int    checkdram     (void);
-char * strmhz(char *buf, long hz);
 int    last_stage_init(void);
 extern ulong monitor_flash_len;
 int mac_read_from_eeprom(void);
@@ -615,6 +614,9 @@ int sprintf(char * buf, const char *fmt, ...)
                __attribute__ ((format (__printf__, 2, 3)));
 int    vsprintf(char *buf, const char *fmt, va_list args);
 
+/* lib_generic/strmhz.c */
+char * strmhz(char *buf, long hz);
+
 /* lib_generic/crc32.c */
 uint32_t crc32 (uint32_t, const unsigned char *, uint);
 uint32_t crc32_wd (uint32_t, const unsigned char *, uint, uint);

diff --git a/lib_arm/board.c b/lib_arm/board.c
index a09386046c3c78624e254c9e51fb77e878a3091f..6e3ef088001862cfd3a79b0cc11446e145d5f4f8 100644 (file)
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -115,19 +115,6 @@ void *sbrk (ptrdiff_t increment)
        return ((void *) old);
 }
 
-char *strmhz(char *buf, long hz)
-{
-       long l, n;
-       long m;
-
-       n = hz / 1000000L;
-       l = sprintf (buf, "%ld", n);
-       m = (hz % 1000000L) / 1000L;
-       if (m != 0)
-               sprintf (buf + l, ".%03ld", m);
-       return (buf);
-}
-
 
 /************************************************************************
  * Coloured LED functionality

diff --git a/lib_generic/Makefile b/lib_generic/Makefile
index 4f6ce73ab3c4431ffc564ec6785acc216edef5bf..bf0e31d127d5f6fd689463cae1414f26c6ba2b6c 100644 (file)
--- a/lib_generic/Makefile
+++ b/lib_generic/Makefile
@@ -40,6 +40,7 @@ COBJS-$(CONFIG_MD5) += md5.o
 COBJS-y += sha1.o
 COBJS-$(CONFIG_SHA256) += sha256.o
 COBJS-y += string.o
+COBJS-y        += strmhz.o
 COBJS-y += vsprintf.o
 COBJS-y += zlib.o
 

diff --git a/lib_generic/strmhz.c b/lib_generic/strmhz.c
new file mode 100644 (file)
index 0000000..d0b6bc6
--- /dev/null
+++ b/lib_generic/strmhz.c
@@ -0,0 +1,36 @@
+/*
+ * (C) Copyright 2002-2006
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#include <common.h>
+
+char *strmhz (char *buf, long hz)
+{
+       long l, n;
+       long m;
+
+       n = hz / 1000000L;
+       l = sprintf (buf, "%ld", n);
+       m = (hz % 1000000L) / 1000L;
+       if (m != 0)
+               sprintf (buf + l, ".%03ld", m);
+       return (buf);
+}

diff --git a/lib_i386/board.c b/lib_i386/board.c
index 22191e6acfa4c3a60d8ec427e4949ee630a10bae..55fa42af424bb53e30ffcbde99547d0ddd663747 100644 (file)
--- a/lib_i386/board.c
+++ b/lib_i386/board.c
@@ -108,19 +108,6 @@ void *sbrk (ptrdiff_t increment)
        return ((void *) old);
 }
 
-char *strmhz (char *buf, long hz)
-{
-       long l, n;
-       long m;
-
-       n = hz / 1000000L;
-       l = sprintf (buf, "%ld", n);
-       m = (hz % 1000000L) / 1000L;
-       if (m != 0)
-               sprintf (buf + l, ".%03ld", m);
-       return (buf);
-}
-
 /************************************************************************
  * Init Utilities                                                      *
  ************************************************************************

diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index dedc9e4088dfd101ca0d2427e582961cf96ecb21..e59c6b0859b03bc9f0027f7deafc5fdb39c0bb63 100644 (file)
--- a/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@ -140,23 +140,6 @@ void *sbrk (ptrdiff_t increment)
        return ((void *)old);
 }
 
-char *strmhz(char *buf, long hz)
-{
-       long l, n;
-       long m;
-
-       n = hz / 1000000L;
-
-       l = sprintf (buf, "%ld", n);
-
-       m = (hz % 1000000L) / 1000L;
-
-       if (m != 0)
-               sprintf (buf+l, ".%03ld", m);
-
-       return (buf);
-}
-
 /*
  * All attempts to come up with a "common" initialization sequence
  * that works for all boards and architectures failed: some of the

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 71a70db504a8c47176cd49a629f455a7cbf2295c..c8f075f5a683b37bf753c63de140ec2d4ac56f20 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -168,19 +168,6 @@ void *sbrk (ptrdiff_t increment)
        return ((void *) old);
 }
 
-char *strmhz (char *buf, long hz)
-{
-       long l, n;
-       long m;
-
-       n = hz / 1000000L;
-       l = sprintf (buf, "%ld", n);
-       m = (hz % 1000000L) / 1000L;
-       if (m != 0)
-               sprintf (buf + l, ".%03ld", m);
-       return (buf);
-}
-
 /*
  * All attempts to come up with a "common" initialization sequence
  * that works for all boards and architectures failed: some of the