lib: net_utils: enforce '.' as octet separator in string_to_ip

[platform/kernel/u-boot.git] / cmd / bdinfo.c

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index c48ad83..ae3027a 100644 (file)
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -98,9 +98,11 @@ static inline void print_bi_dram(const bd_t *bd)
        int i;
 
        for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) {
-               print_num("DRAM bank",  i);
-               print_num("-> start",   bd->bi_dram[i].start);
-               print_num("-> size",    bd->bi_dram[i].size);
+               if (bd->bi_dram[i].size) {
+                       print_num("DRAM bank",  i);
+                       print_num("-> start",   bd->bi_dram[i].start);
+                       print_num("-> size",    bd->bi_dram[i].size);
+               }
        }
 #endif
 }
@@ -157,6 +159,15 @@ static inline void print_baudrate(void)
 #endif
 }
 
+static inline void print_std_bdinfo(const bd_t *bd)
+{
+       print_bi_boot_params(bd);
+       print_bi_mem(bd);
+       print_bi_flash(bd);
+       print_eth_ip_addr();
+       print_baudrate();
+}
+
 #if defined(CONFIG_PPC)
 void __weak board_detail(void)
 {
@@ -340,11 +351,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_mhz("CCLK",       bd->bi_cclk);
        print_mhz("SCLK",       bd->bi_sclk);
 
-       print_bi_boot_params(bd);
-       print_bi_mem(bd);
-       print_bi_flash(bd);
-       print_eth_ip_addr();
-       print_baudrate();
+       print_std_bdinfo(bd);
 
        return 0;
 }
@@ -353,13 +360,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       bd_t *bd = gd->bd;
-
-       print_bi_boot_params(bd);
-       print_bi_mem(bd);
-       print_bi_flash(bd);
-       print_eth_ip_addr();
-       print_baudrate();
+       print_std_bdinfo(gd->bd);
        print_num("relocaddr", gd->relocaddr);
        print_num("reloc off", gd->reloc_off);
 
@@ -370,14 +371,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       bd_t *bd = gd->bd;
-
-       print_bi_boot_params(bd);
-       print_bi_mem(bd);
-       print_bi_flash(bd);
-       print_eth_ip_addr();
-       print_baudrate();
-
+       print_std_bdinfo(gd->bd);
        return 0;
 }
 
@@ -452,16 +446,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        bd_t *bd = gd->bd;
 
        print_bi_boot_params(bd);
-       print_num("bi_memstart",        bd->bi_memstart);
-       print_num("bi_memsize",         bd->bi_memsize);
-       print_num("bi_flashstart",      bd->bi_flashstart);
-       print_num("bi_flashsize",       bd->bi_flashsize);
-       print_num("bi_flashoffset",     bd->bi_flashoffset);
-       print_num("bi_sramstart",       bd->bi_sramstart);
-       print_num("bi_sramsize",        bd->bi_sramsize);
-       print_num("bi_bootflags",       bd->bi_bootflags);
-       print_mhz("cpufreq",            bd->bi_intfreq);
-       print_mhz("busfreq",            bd->bi_busfreq);
 
        print_bi_dram(bd);
 
@@ -532,6 +516,14 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        return 0;
 }
 
+#elif defined(CONFIG_XTENSA)
+
+int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       print_std_bdinfo(gd->bd);
+       return 0;
+}
+
 #else
  #error "a case for this architecture does not exist!"
 #endif