Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

[karo-tx-uboot.git] / common / cmd_bdinfo.c

diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index 58ee9f350f6696a49c8d62411748b4e0cb89869c..c28a155453099fda3e5d7ca4ab232f89a87527d3 100644 (file)
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -30,7 +30,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_CMD_BDI)
 static void print_num(const char *, ulong);
 
 #ifndef CONFIG_ARM     /* PowerPC and other */
@@ -153,7 +152,9 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
+#if defined(CONFIG_CMD_NET)
        int i;
+#endif
        bd_t *bd = gd->bd;
 
        print_num ("mem start",         (ulong)bd->bi_memstart);
@@ -208,24 +209,36 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 #elif defined(CONFIG_M68K) /* M68K */
+static void print_str(const char *, const char *);
 
 int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        int i;
        bd_t *bd = gd->bd;
+       char buf[32];
+
        print_num ("memstart",          (ulong)bd->bi_memstart);
        print_num ("memsize",           (ulong)bd->bi_memsize);
        print_num ("flashstart",        (ulong)bd->bi_flashstart);
        print_num ("flashsize",         (ulong)bd->bi_flashsize);
        print_num ("flashoffset",       (ulong)bd->bi_flashoffset);
 #if defined(CFG_INIT_RAM_ADDR)
-       print_num ("sramstart",     (ulong)bd->bi_sramstart);
-       print_num ("sramsize",      (ulong)bd->bi_sramsize);
+       print_num ("sramstart",         (ulong)bd->bi_sramstart);
+       print_num ("sramsize",          (ulong)bd->bi_sramsize);
 #endif
 #if defined(CFG_MBAR)
-       print_num ("mbar",          bd->bi_mbar_base    );
+       print_num ("mbar",              bd->bi_mbar_base);
 #endif
-#if defined(CFG_CMD_NET)
+       print_str ("busfreq",           strmhz(buf, bd->bi_busfreq));
+#ifdef CONFIG_PCI
+       print_str ("pcifreq",           strmhz(buf, bd->bi_pcifreq));
+#endif
+#ifdef CONFIG_EXTRA_CLOCK
+       print_str ("flbfreq",           strmhz(buf, bd->bi_flbfreq));
+       print_str ("inpfreq",           strmhz(buf, bd->bi_inpfreq));
+       print_str ("vcofreq",           strmhz(buf, bd->bi_vcofreq));
+#endif
+#if defined(CONFIG_CMD_NET)
        puts ("ethaddr     =");
        for (i=0; i<6; ++i) {
                printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
@@ -239,22 +252,22 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #endif
 
 #if defined(CONFIG_HAS_ETH2)
-       puts ("\neth2addr    =");
-       for (i=0; i<6; ++i) {
+       puts ("\neth2addr    =");
+       for (i=0; i<6; ++i) {
                printf ("%c%02X", i ? ':' : ' ', bd->bi_enet2addr[i]);
        }
 #endif
 
 #if defined(CONFIG_HAS_ETH3)
-       puts ("\neth3addr    =");
-       for (i=0; i<6; ++i) {
+       puts ("\neth3addr    =");
+       for (i=0; i<6; ++i) {
                printf ("%c%02X", i ? ':' : ' ', bd->bi_enet3addr[i]);
        }
 #endif
 
        puts ("\nip_addr     = ");
        print_IPaddr (bd->bi_ip_addr);
-#endif /* CFG_CMD_NET */
+#endif
        printf ("\nbaudrate    = %d bps\n", bd->bi_baudrate);
 
        return 0;
@@ -323,7 +336,7 @@ static void print_num(const char *name, ulong value)
        printf ("%-12s= 0x%08lX\n", name, value);
 }
 
-#ifdef CONFIG_PPC
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
 static void print_str(const char *name, const char *str)
 {
        printf ("%-12s= %6s MHz\n", name, str);
@@ -338,4 +351,3 @@ U_BOOT_CMD(
        "bdinfo  - print Board Info structure\n",
        NULL
 );
-#endif