cmd/bdinfo: extract print_eth_ip_addr

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

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 4afbeb4..5409105 100644 (file)
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -92,6 +92,60 @@ static inline void print_bi_mem(const bd_t *bd)
 #endif
 }
 
+static inline void print_bi_dram(const bd_t *bd)
+{
+#ifdef CONFIG_NR_DRAM_BANKS
+       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);
+       }
+#endif
+}
+
+static inline void print_bi_flash(const bd_t *bd)
+{
+#if defined(CONFIG_MICROBLAZE) || defined(CONFIG_SH)
+       print_num("flash start    ",    (ulong)bd->bi_flashstart);
+       print_num("flash size     ",    (ulong)bd->bi_flashsize);
+       print_num("flash offset   ",    (ulong)bd->bi_flashoffset);
+
+#elif defined(CONFIG_NIOS2) || defined(CONFIG_OPENRISC)
+       print_num("flash start",        (ulong)bd->bi_flashstart);
+       print_num("flash size",         (ulong)bd->bi_flashsize);
+       print_num("flash offset",       (ulong)bd->bi_flashoffset);
+#else
+       print_num("flashstart",         (ulong)bd->bi_flashstart);
+       print_num("flashsize",          (ulong)bd->bi_flashsize);
+       print_num("flashoffset",        (ulong)bd->bi_flashoffset);
+#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
+}
+
 #if defined(CONFIG_PPC)
 void __weak board_detail(void)
 {
@@ -106,9 +160,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_num("bd address",         (ulong)bd);
 #endif
        print_bi_mem(bd);
-       print_num("flashstart",         bd->bi_flashstart);
-       print_num("flashsize",          bd->bi_flashsize);
-       print_num("flashoffset",        bd->bi_flashoffset);
+       print_bi_flash(bd);
        print_num("sramstart",          bd->bi_sramstart);
        print_num("sramsize",           bd->bi_sramsize);
 #if    defined(CONFIG_5xx)  || defined(CONFIG_8xx) || \
@@ -151,24 +203,7 @@ 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"));
+       print_eth_ip_addr();
        printf("baudrate    = %6u bps\n", gd->baudrate);
        print_num("relocaddr", gd->relocaddr);
        board_detail();
@@ -179,29 +214,17 @@ 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[])
 {
-       int i;
        bd_t *bd = gd->bd;
 
-       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);
-       }
-
-       print_num("flash start",        (ulong)bd->bi_flashstart);
-       print_num("flash size",         (ulong)bd->bi_flashsize);
-       print_num("flash offset",       (ulong)bd->bi_flashoffset);
+       print_bi_dram(bd);
+       print_bi_flash(bd);
 
 #if defined(CONFIG_SYS_SRAM_BASE)
        print_num ("sram start",        (ulong)bd->bi_sramstart);
        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
-
+       print_eth_ip_addr();
        printf("baudrate    = %u bps\n", gd->baudrate);
 
        return 0;
@@ -212,17 +235,9 @@ 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;
-       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);
-       }
-
-       print_num("flash start    ",    (ulong)bd->bi_flashstart);
-       print_num("flash size     ",    (ulong)bd->bi_flashsize);
-       print_num("flash offset   ",    (ulong)bd->bi_flashoffset);
+       print_bi_dram(bd);
+       print_bi_flash(bd);
 #if defined(CONFIG_SYS_SRAM_BASE)
        print_num("sram start     ",    (ulong)bd->bi_sramstart);
        print_num("sram size      ",    (ulong)bd->bi_sramsize);
@@ -265,10 +280,7 @@ 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
+       print_eth_ip_addr();
        printf("baudrate               = %6u bps\n", gd->baudrate);
        return 0;
 }
@@ -280,9 +292,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        bd_t *bd = gd->bd;
 
        print_bi_mem(bd);
-       print_num("flashstart",         (ulong)bd->bi_flashstart);
-       print_num("flashsize",          (ulong)bd->bi_flashsize);
-       print_num("flashoffset",        (ulong)bd->bi_flashoffset);
+       print_bi_flash(bd);
 #if defined(CONFIG_SYS_INIT_RAM_ADDR)
        print_num("sramstart",          (ulong)bd->bi_sramstart);
        print_num("sramsize",           (ulong)bd->bi_sramsize);
@@ -300,20 +310,7 @@ 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
+       print_eth_ip_addr();
        printf("baudrate    = %u bps\n", gd->baudrate);
 
        return 0;
@@ -334,12 +331,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        print_bi_boot_params(bd);
        print_bi_mem(bd);
-       print_num("flashstart",         (ulong)bd->bi_flashstart);
-       print_num("flashsize",          (ulong)bd->bi_flashsize);
-       print_num("flashoffset",        (ulong)bd->bi_flashoffset);
-
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
+       print_bi_flash(bd);
+       print_eth_ip_addr();
        printf("baudrate    = %u bps\n", gd->baudrate);
 
        return 0;
@@ -353,12 +346,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        print_bi_boot_params(bd);
        print_bi_mem(bd);
-       print_num("flashstart",         (ulong)bd->bi_flashstart);
-       print_num("flashsize",          (ulong)bd->bi_flashsize);
-       print_num("flashoffset",        (ulong)bd->bi_flashoffset);
-
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
+       print_bi_flash(bd);
+       print_eth_ip_addr();
        printf("baudrate    = %u bps\n", gd->baudrate);
        print_num("relocaddr", gd->relocaddr);
        print_num("reloc off", gd->reloc_off);
@@ -374,12 +363,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        print_bi_boot_params(bd);
        print_bi_mem(bd);
-       print_num("flashstart",         (ulong)bd->bi_flashstart);
-       print_num("flashsize",          (ulong)bd->bi_flashsize);
-       print_num("flashoffset",        (ulong)bd->bi_flashoffset);
-
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
+       print_bi_flash(bd);
+       print_eth_ip_addr();
        printf("baudrate    = %u bps\n", gd->baudrate);
 
        return 0;
@@ -390,17 +375,11 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc,
                        char * const argv[])
 {
-       int i;
        bd_t *bd = gd->bd;
 
        print_num("arch_number",        bd->bi_arch_number);
        print_bi_boot_params(bd);
-
-       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);
-       }
+       print_bi_dram(bd);
 
 #ifdef CONFIG_SYS_MEM_RESERVE_SECURE
        if (gd->arch.secure_ram & MEM_RESERVE_SECURE_SECURED) {
@@ -449,14 +428,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        bd_t *bd = gd->bd;
 
        print_bi_mem(bd);
-       print_num("flash start    ",    (ulong)bd->bi_flashstart);
-       print_num("flash size     ",    (ulong)bd->bi_flashsize);
-       print_num("flash offset   ",    (ulong)bd->bi_flashoffset);
-
-#if defined(CONFIG_CMD_NET)
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-#endif
+       print_bi_flash(bd);
+       print_eth_ip_addr();
        printf("baudrate    = %u bps\n", gd->baudrate);
        return 0;
 }
@@ -465,7 +438,6 @@ 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[])
 {
-       int i;
        bd_t *bd = gd->bd;
 
        print_bi_boot_params(bd);
@@ -480,15 +452,10 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_mhz("cpufreq",            bd->bi_intfreq);
        print_mhz("busfreq",            bd->bi_busfreq);
 
-       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);
-       }
+       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);
@@ -500,21 +467,12 @@ 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[])
 {
-       int i;
        bd_t *bd = gd->bd;
 
        print_bi_boot_params(bd);
+       print_bi_dram(bd);
+       print_eth_ip_addr();
 
-       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 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
@@ -525,22 +483,12 @@ 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[])
 {
-       int i;
        bd_t *bd = gd->bd;
 
        print_num("arch_number",        bd->bi_arch_number);
        print_bi_boot_params(bd);
-
-       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 defined(CONFIG_CMD_NET)
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-#endif
+       print_bi_dram(bd);
+       print_eth_ip_addr();
        printf("baudrate    = %u bps\n", gd->baudrate);
 
        return 0;
@@ -553,15 +501,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        bd_t *bd = gd->bd;
 
        print_bi_mem(bd);
-       print_num("flash start",        (ulong)bd->bi_flashstart);
-       print_num("flash size",         (ulong)bd->bi_flashsize);
-       print_num("flash offset",       (ulong)bd->bi_flashoffset);
-
-#if defined(CONFIG_CMD_NET)
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-#endif
-
+       print_bi_flash(bd);
+       print_eth_ip_addr();
        printf("baudrate    = %u bps\n", gd->baudrate);
 
        return 0;
@@ -574,11 +515,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        bd_t *bd = gd->bd;
 
        print_bi_mem(bd);
-
-#if defined(CONFIG_CMD_NET)
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
-#endif
+       print_eth_ip_addr();
        printf("baudrate    = %d bps\n", gd->baudrate);
 
        return 0;