Only use fb_base if we have a display

[u-boot] / common / cmd_bdinfo.c

diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index 5359a47859b98fb431e3d99a9a3c36a6f10ff404..6800c4f9ce02fd4f171a39f53d69b676773a6039 100644 (file)
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -51,7 +51,7 @@ static void print_eth(int idx)
 }
 
 __maybe_unused
-static void print_lnum(const char *name, u64 value)
+static void print_lnum(const char *name, unsigned long long value)
 {
        printf("%-12s= 0x%.8llX\n", name, value);
 }
@@ -119,6 +119,14 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_mhz("pevfreq",            bd->bi_pevfreq);
 #endif
 
+#ifdef CONFIG_ENABLE_36BIT_PHYS
+#ifdef CONFIG_PHYS_64BIT
+       puts("addressing  = 36-bit\n");
+#else
+       puts("addressing  = 32-bit\n");
+#endif
+#endif
+
        print_eth(0);
 #if defined(CONFIG_HAS_ETH1)
        print_eth(1);
@@ -139,8 +147,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #ifdef CONFIG_HERMES
        print_mhz("ethspeed",           bd->bi_ethspeed);
 #endif
-       printf("IP addr     = %pI4\n", &bd->bi_ip_addr);
-       printf("baudrate    = %6ld bps\n", bd->bi_baudrate);
+       printf("IP addr     = %s\n", getenv("ipaddr"));
+       printf("baudrate    = %6u bps\n", bd->bi_baudrate);
        print_num("relocaddr", gd->relocaddr);
        return 0;
 }
@@ -164,10 +172,10 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 #if defined(CONFIG_CMD_NET)
        print_eth(0);
-       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
 #endif
 
-       printf("baudrate    = %ld bps\n", bd->bi_baudrate);
+       printf("baudrate    = %u bps\n", bd->bi_baudrate);
 
        return 0;
 }
@@ -188,9 +196,9 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #endif
 #if defined(CONFIG_CMD_NET)
        print_eth(0);
-       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
 #endif
-       printf("baudrate    = %ld bps\n", (ulong)bd->bi_baudrate);
+       printf("baudrate    = %u bps\n", (ulong)bd->bi_baudrate);
        return 0;
 }
 
@@ -208,22 +216,22 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
        print_num("flashstart             ", bd->bi_flashstart);
        print_num("CONFIG_SYS_MONITOR_BASE       ", CONFIG_SYS_MONITOR_BASE);
        print_num("CONFIG_ENV_ADDR           ", CONFIG_ENV_ADDR);
-       printf("CONFIG_SYS_RELOC_MONITOR_BASE = 0x%lx (%d)\n", CONFIG_SYS_RELOC_MONITOR_BASE,
+       printf("CONFIG_SYS_RELOC_MONITOR_BASE = 0x%x (%d)\n", CONFIG_SYS_RELOC_MONITOR_BASE,
               CONFIG_SYS_MONITOR_LEN);
-       printf("CONFIG_SYS_MALLOC_BASE        = 0x%lx (%d)\n", CONFIG_SYS_MALLOC_BASE,
+       printf("CONFIG_SYS_MALLOC_BASE        = 0x%x (%d)\n", CONFIG_SYS_MALLOC_BASE,
               CONFIG_SYS_MALLOC_LEN);
-       printf("CONFIG_SYS_INIT_SP_OFFSET     = 0x%lx (%d)\n", CONFIG_SYS_INIT_SP_OFFSET,
+       printf("CONFIG_SYS_INIT_SP_OFFSET     = 0x%x (%d)\n", CONFIG_SYS_INIT_SP_OFFSET,
               CONFIG_SYS_STACK_SIZE);
-       printf("CONFIG_SYS_PROM_OFFSET        = 0x%lx (%d)\n", CONFIG_SYS_PROM_OFFSET,
+       printf("CONFIG_SYS_PROM_OFFSET        = 0x%x (%d)\n", CONFIG_SYS_PROM_OFFSET,
               CONFIG_SYS_PROM_SIZE);
-       printf("CONFIG_SYS_GBL_DATA_OFFSET    = 0x%lx (%d)\n", CONFIG_SYS_GBL_DATA_OFFSET,
+       printf("CONFIG_SYS_GBL_DATA_OFFSET    = 0x%x (%d)\n", CONFIG_SYS_GBL_DATA_OFFSET,
               GENERATED_GBL_DATA_SIZE);
 
 #if defined(CONFIG_CMD_NET)
        print_eth(0);
-       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
 #endif
-       printf("baudrate               = %6ld bps\n", bd->bi_baudrate);
+       printf("baudrate               = %6u bps\n", bd->bi_baudrate);
        return 0;
 }
 
@@ -267,9 +275,9 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_eth(3);
 #endif
 
-       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
 #endif
-       printf("baudrate    = %ld bps\n", bd->bi_baudrate);
+       printf("baudrate    = %u bps\n", bd->bi_baudrate);
 
        return 0;
 }
@@ -295,8 +303,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_num("flashoffset",        (ulong)bd->bi_flashoffset);
 
        print_eth(0);
-       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
-       printf("baudrate    = %d bps\n", bd->bi_baudrate);
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
+       printf("baudrate    = %u bps\n", bd->bi_baudrate);
 
        return 0;
 }
@@ -315,8 +323,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_num("flashoffset",        (ulong)bd->bi_flashoffset);
 
        print_eth(0);
-       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
-       printf("baudrate    = %d bps\n", bd->bi_baudrate);
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
+       printf("baudrate    = %u bps\n", bd->bi_baudrate);
 
        return 0;
 }
@@ -335,8 +343,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_num("flashoffset",        (ulong)bd->bi_flashoffset);
 
        print_eth(0);
-       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
-       printf("baudrate    = %lu bps\n", bd->bi_baudrate);
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
+       printf("baudrate    = %u bps\n", bd->bi_baudrate);
 
        return 0;
 }
@@ -359,17 +367,19 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 #if defined(CONFIG_CMD_NET)
        print_eth(0);
-       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
 #endif
-       printf("baudrate    = %d bps\n", bd->bi_baudrate);
+       printf("baudrate    = %u bps\n", bd->bi_baudrate);
 #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
-       print_num("TLB addr", gd->tlb_addr);
+       print_num("TLB addr", gd->arch.tlb_addr);
 #endif
        print_num("relocaddr", gd->relocaddr);
        print_num("reloc off", gd->reloc_off);
        print_num("irq_sp", gd->irq_sp);        /* irq stack pointer */
        print_num("sp start ", gd->start_addr_sp);
+#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
        print_num("FB base  ", gd->fb_base);
+#endif
        /*
         * TODO: Currently only support for davinci SOC's is added.
         * Remove this check once all the board implement this.
@@ -395,9 +405,9 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 #if defined(CONFIG_CMD_NET)
        print_eth(0);
-       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
 #endif
-       printf("baudrate    = %ld bps\n", (ulong)bd->bi_baudrate);
+       printf("baudrate    = %u bps\n", bd->bi_baudrate);
        return 0;
 }
 
@@ -428,10 +438,10 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 #if defined(CONFIG_CMD_NET)
        print_eth(0);
-       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
        print_mhz("ethspeed",       bd->bi_ethspeed);
 #endif
-       printf("baudrate    = %d bps\n", bd->bi_baudrate);
+       printf("baudrate    = %u bps\n", bd->bi_baudrate);
 
        return 0;
 }
@@ -453,9 +463,11 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 #if defined(CONFIG_CMD_NET)
        print_eth(0);
-       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
 #endif
+#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
        print_num("FB base  ", gd->fb_base);
+#endif
        return 0;
 }
 
@@ -477,9 +489,9 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 #if defined(CONFIG_CMD_NET)
        print_eth(0);
-       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
 #endif
-       printf("baudrate    = %d bps\n", bd->bi_baudrate);
+       printf("baudrate    = %u bps\n", bd->bi_baudrate);
 
        return 0;
 }
@@ -498,10 +510,10 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 #if defined(CONFIG_CMD_NET)
        print_eth(0);
-       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
 #endif
 
-       printf("baudrate    = %ld bps\n", bd->bi_baudrate);
+       printf("baudrate    = %u bps\n", bd->bi_baudrate);
 
        return 0;
 }