Change bd/gd memsize/ram_size to be phys_size_t.

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

diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index c28a155453099fda3e5d7ca4ab232f89a87527d3..5bb39d8db98dc0145d362e039833aa659cf0888a 100644 (file)
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -33,6 +33,7 @@ DECLARE_GLOBAL_DATA_PTR;
 static void print_num(const char *, ulong);
 
 #ifndef CONFIG_ARM     /* PowerPC and other */
+static void print_lnum(const char *, u64);
 
 #ifdef CONFIG_PPC
 static void print_str(const char *, const char *);
@@ -47,7 +48,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        print_num ("bd address",    (ulong)bd           );
 #endif
        print_num ("memstart",      bd->bi_memstart     );
-       print_num ("memsize",       bd->bi_memsize      );
+       print_lnum ("memsize",      bd->bi_memsize      );
        print_num ("flashstart",    bd->bi_flashstart   );
        print_num ("flashsize",     bd->bi_flashsize    );
        print_num ("flashoffset",   bd->bi_flashoffset  );
@@ -132,7 +133,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        bd_t *bd = gd->bd;
 
        print_num ("memstart",          (ulong)bd->bi_memstart);
-       print_num ("memsize",           (ulong)bd->bi_memsize);
+       print_lnum ("memsize",          (u64)bd->bi_memsize);
        print_num ("flashstart",        (ulong)bd->bi_flashstart);
        print_num ("flashsize",         (ulong)bd->bi_flashsize);
        print_num ("flashoffset",       (ulong)bd->bi_flashoffset);
@@ -158,7 +159,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        bd_t *bd = gd->bd;
 
        print_num ("mem start",         (ulong)bd->bi_memstart);
-       print_num ("mem size",          (ulong)bd->bi_memsize);
+       print_lnum ("mem size",         (u64)bd->bi_memsize);
        print_num ("flash start",       (ulong)bd->bi_flashstart);
        print_num ("flash size",        (ulong)bd->bi_flashsize);
        print_num ("flash offset",      (ulong)bd->bi_flashoffset);
@@ -188,7 +189,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        int i;
        bd_t *bd = gd->bd;
        print_num ("mem start      ",   (ulong)bd->bi_memstart);
-       print_num ("mem size       ",   (ulong)bd->bi_memsize);
+       print_lnum ("mem size       ",  (u64)bd->bi_memsize);
        print_num ("flash start    ",   (ulong)bd->bi_flashstart);
        print_num ("flash size     ",   (ulong)bd->bi_flashsize);
        print_num ("flash offset   ",   (ulong)bd->bi_flashoffset);
@@ -208,6 +209,45 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
+#elif defined(CONFIG_SPARC)    /* SPARC */
+int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+{
+       bd_t *bd = gd->bd;
+#if defined(CONFIG_CMD_NET)
+       int i;
+#endif
+
+#ifdef DEBUG
+       print_num("bd address             ", (ulong) bd);
+#endif
+       print_num("memstart               ", bd->bi_memstart);
+       print_lnum("memsize                ", bd->bi_memsize);
+       print_num("flashstart             ", bd->bi_flashstart);
+       print_num("CFG_MONITOR_BASE       ", CFG_MONITOR_BASE);
+       print_num("CFG_ENV_ADDR           ", CFG_ENV_ADDR);
+       printf("CFG_RELOC_MONITOR_BASE = 0x%lx (%d)\n", CFG_RELOC_MONITOR_BASE,
+              CFG_MONITOR_LEN);
+       printf("CFG_MALLOC_BASE        = 0x%lx (%d)\n", CFG_MALLOC_BASE,
+              CFG_MALLOC_LEN);
+       printf("CFG_INIT_SP_OFFSET     = 0x%lx (%d)\n", CFG_INIT_SP_OFFSET,
+              CFG_STACK_SIZE);
+       printf("CFG_PROM_OFFSET        = 0x%lx (%d)\n", CFG_PROM_OFFSET,
+              CFG_PROM_SIZE);
+       printf("CFG_GBL_DATA_OFFSET    = 0x%lx (%d)\n", CFG_GBL_DATA_OFFSET,
+              CFG_GBL_DATA_SIZE);
+
+#if defined(CONFIG_CMD_NET)
+       puts("ethaddr                =");
+       for (i = 0; i < 6; ++i) {
+               printf("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
+       }
+       puts("\nIP addr                = ");
+       print_IPaddr(bd->bi_ip_addr);
+#endif
+       printf("\nbaudrate               = %6ld bps\n", bd->bi_baudrate);
+       return 0;
+}
+
 #elif defined(CONFIG_M68K) /* M68K */
 static void print_str(const char *, const char *);
 
@@ -218,7 +258,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        char buf[32];
 
        print_num ("memstart",          (ulong)bd->bi_memstart);
-       print_num ("memsize",           (ulong)bd->bi_memsize);
+       print_lnum ("memsize",          (u64)bd->bi_memsize);
        print_num ("flashstart",        (ulong)bd->bi_flashstart);
        print_num ("flashsize",         (ulong)bd->bi_flashsize);
        print_num ("flashoffset",       (ulong)bd->bi_flashoffset);
@@ -273,6 +313,37 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
+#elif defined(CONFIG_BLACKFIN)
+
+int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+       int i;
+       bd_t *bd = gd->bd;
+
+       printf("U-Boot      = %s\n", bd->bi_r_version);
+       printf("CPU         = %s\n", bd->bi_cpu);
+       printf("Board       = %s\n", bd->bi_board_name);
+       printf("VCO         = %lu MHz\n", bd->bi_vco / 1000000);
+       printf("CCLK        = %lu MHz\n", bd->bi_cclk / 1000000);
+       printf("SCLK        = %lu MHz\n", bd->bi_sclk / 1000000);
+
+       print_num("boot_params", (ulong)bd->bi_boot_params);
+       print_num("memstart",    (ulong)bd->bi_memstart);
+       print_lnum("memsize",    (u64)bd->bi_memsize);
+       print_num("flashstart",  (ulong)bd->bi_flashstart);
+       print_num("flashsize",   (ulong)bd->bi_flashsize);
+       print_num("flashoffset", (ulong)bd->bi_flashoffset);
+
+       puts("ethaddr     =");
+       for (i = 0; i < 6; ++i)
+               printf("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
+       puts("\nip_addr     = ");
+       print_IPaddr(bd->bi_ip_addr);
+       printf("\nbaudrate    = %d bps\n", bd->bi_baudrate);
+
+       return 0;
+}
+
 #else /* ! PPC, which leaves MIPS */
 
 int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -282,7 +353,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        print_num ("boot_params",       (ulong)bd->bi_boot_params);
        print_num ("memstart",          (ulong)bd->bi_memstart);
-       print_num ("memsize",           (ulong)bd->bi_memsize);
+       print_lnum ("memsize",          (u64)bd->bi_memsize);
        print_num ("flashstart",        (ulong)bd->bi_flashstart);
        print_num ("flashsize",         (ulong)bd->bi_flashsize);
        print_num ("flashoffset",       (ulong)bd->bi_flashoffset);
@@ -316,6 +387,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                print_num("-> size",    bd->bi_dram[i].size);
        }
 
+#if defined(CONFIG_CMD_NET)
        puts ("ethaddr     =");
        for (i=0; i<6; ++i) {
                printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
@@ -323,6 +395,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        puts  ( "\n"
                "ip_addr     = ");
        print_IPaddr (bd->bi_ip_addr);
+#endif
        printf ("\n"
                "baudrate    = %d bps\n", bd->bi_baudrate);
 
@@ -336,6 +409,13 @@ static void print_num(const char *name, ulong value)
        printf ("%-12s= 0x%08lX\n", name, value);
 }
 
+#ifndef CONFIG_ARM
+static void print_lnum(const char *name, u64 value)
+{
+       printf ("%-12s= 0x%.8llX\n", name, value);
+}
+#endif
+
 #if defined(CONFIG_PPC) || defined(CONFIG_M68K)
 static void print_str(const char *name, const char *str)
 {