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 fc0f2d0..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
 }
@@ -123,6 +125,49 @@ static inline void print_bi_flash(const bd_t *bd)
 #endif
 }
 
+static inline void print_eth_ip_addr(void)
+{
+#if defined(CONFIG_CMD_NET)
+       print_eth(0);
+#if defined(CONFIG_HAS_ETH1)
+       print_eth(1);
+#endif
+#if defined(CONFIG_HAS_ETH2)
+       print_eth(2);
+#endif
+#if defined(CONFIG_HAS_ETH3)
+       print_eth(3);
+#endif
+#if defined(CONFIG_HAS_ETH4)
+       print_eth(4);
+#endif
+#if defined(CONFIG_HAS_ETH5)
+       print_eth(5);
+#endif
+       printf("IP addr     = %s\n", getenv("ipaddr"));
+#endif
+}
+
+static inline void print_baudrate(void)
+{
+#if defined(CONFIG_PPC)
+       printf("baudrate    = %6u bps\n", gd->baudrate);
+#elif defined(CONFIG_SPARC)
+       printf("baudrate               = %6u bps\n", gd->baudrate);
+#else
+       printf("baudrate    = %u bps\n", gd->baudrate);
+#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)
 {
@@ -180,25 +225,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #endif
 #endif
 
-       print_eth(0);
-#if defined(CONFIG_HAS_ETH1)
-       print_eth(1);
-#endif
-#if defined(CONFIG_HAS_ETH2)
-       print_eth(2);
-#endif
-#if defined(CONFIG_HAS_ETH3)
-       print_eth(3);
-#endif
-#if defined(CONFIG_HAS_ETH4)
-       print_eth(4);
-#endif
-#if defined(CONFIG_HAS_ETH5)
-       print_eth(5);
-#endif
-
-       printf("IP addr     = %s\n", getenv("ipaddr"));
-       printf("baudrate    = %6u bps\n", gd->baudrate);
+       print_eth_ip_addr();
+       print_baudrate();
        print_num("relocaddr", gd->relocaddr);
        board_detail();
        return 0;
@@ -218,12 +246,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_num ("sram size",         (ulong)bd->bi_sramsize);
 #endif
 
-#if defined(CONFIG_CMD_NET)
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-#endif
-
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_eth_ip_addr();
+       print_baudrate();
 
        return 0;
 }
@@ -243,7 +267,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #if defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)
        print_eths();
 #endif
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_baudrate();
        print_num("relocaddr", gd->relocaddr);
        print_num("reloc off", gd->reloc_off);
        print_num("fdt_blob", (ulong)gd->fdt_blob);
@@ -278,11 +302,8 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
        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     = %s\n", getenv("ipaddr"));
-#endif
-       printf("baudrate               = %6u bps\n", gd->baudrate);
+       print_eth_ip_addr();
+       print_baudrate();
        return 0;
 }
 
@@ -311,21 +332,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_mhz("inpfreq",            bd->bi_inpfreq);
        print_mhz("vcofreq",            bd->bi_vcofreq);
 #endif
-#if defined(CONFIG_CMD_NET)
-       print_eth(0);
-#if defined(CONFIG_HAS_ETH1)
-       print_eth(1);
-#endif
-#if defined(CONFIG_HAS_ETH2)
-       print_eth(2);
-#endif
-#if defined(CONFIG_HAS_ETH3)
-       print_eth(3);
-#endif
-
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-#endif
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_eth_ip_addr();
+       print_baudrate();
 
        return 0;
 }
@@ -343,13 +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(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_std_bdinfo(bd);
 
        return 0;
 }
@@ -358,15 +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(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_std_bdinfo(gd->bd);
        print_num("relocaddr", gd->relocaddr);
        print_num("reloc off", gd->reloc_off);
 
@@ -377,16 +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(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-       printf("baudrate    = %u bps\n", gd->baudrate);
-
+       print_std_bdinfo(gd->bd);
        return 0;
 }
 
@@ -410,7 +395,7 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc,
 #if defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)
        print_eths();
 #endif
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_baudrate();
 #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
        print_num("TLB addr", gd->arch.tlb_addr);
 #endif
@@ -449,12 +434,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        print_bi_mem(bd);
        print_bi_flash(bd);
-
-#if defined(CONFIG_CMD_NET)
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-#endif
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_eth_ip_addr();
+       print_baudrate();
        return 0;
 }
 
@@ -465,25 +446,14 @@ 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);
 
 #if defined(CONFIG_CMD_NET)
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
+       print_eth_ip_addr();
        print_mhz("ethspeed",       bd->bi_ethspeed);
 #endif
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_baudrate();
 
        return 0;
 }
@@ -496,11 +466,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        print_bi_boot_params(bd);
        print_bi_dram(bd);
+       print_eth_ip_addr();
 
-#if defined(CONFIG_CMD_NET)
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-#endif
 #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
        print_num("FB base  ", gd->fb_base);
 #endif
@@ -516,12 +483,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_num("arch_number",        bd->bi_arch_number);
        print_bi_boot_params(bd);
        print_bi_dram(bd);
-
-#if defined(CONFIG_CMD_NET)
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-#endif
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_eth_ip_addr();
+       print_baudrate();
 
        return 0;
 }
@@ -534,13 +497,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        print_bi_mem(bd);
        print_bi_flash(bd);
-
-#if defined(CONFIG_CMD_NET)
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-#endif
-
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_eth_ip_addr();
+       print_baudrate();
 
        return 0;
 }
@@ -552,13 +510,17 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        bd_t *bd = gd->bd;
 
        print_bi_mem(bd);
+       print_eth_ip_addr();
+       print_baudrate();
 
-#if defined(CONFIG_CMD_NET)
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-#endif
-       printf("baudrate    = %d bps\n", gd->baudrate);
+       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;
 }