spl: spl_mmc: Minor cosmetics

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

diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index e9eab232f961bb873a019fde8580a06fe4236b80..ed3b9351b1a7a4648ef3bab4c105b0cfe0cf2dc2 100644 (file)
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -34,6 +34,7 @@ static void print_eth(int idx)
        printf("%-12s= %s\n", name, val);
 }
 
+#ifndef CONFIG_DM_ETH
 __maybe_unused
 static void print_eths(void)
 {
@@ -52,6 +53,7 @@ static void print_eths(void)
        printf("current eth = %s\n", eth_get_name());
        printf("ip_addr     = %s\n", getenv("ipaddr"));
 }
+#endif
 
 __maybe_unused
 static void print_lnum(const char *name, unsigned long long value)
@@ -345,8 +347,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        bd_t *bd = gd->bd;
 
        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("memstart",           (ulong)bd->bi_dram[0].start);
+       print_lnum("memsize",           (u64)bd->bi_dram[0].size);
        print_num("flashstart",         (ulong)bd->bi_flashstart);
        print_num("flashsize",          (ulong)bd->bi_flashsize);
        print_num("flashoffset",        (ulong)bd->bi_flashoffset);
@@ -375,7 +377,7 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc,
                print_num("-> size",    bd->bi_dram[i].size);
        }
 
-#if defined(CONFIG_CMD_NET)
+#if defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)
        print_eths();
 #endif
        printf("baudrate    = %u bps\n", gd->baudrate);
@@ -397,6 +399,9 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc,
        printf("ARM frequency = %ld MHz\n", gd->bd->bi_arm_freq);
        printf("DSP frequency = %ld MHz\n", gd->bd->bi_dsp_freq);
        printf("DDR frequency = %ld MHz\n", gd->bd->bi_ddr_freq);
+#endif
+#ifdef CONFIG_BOARD_TYPES
+       printf("Board Type  = %ld\n", gd->board_type);
 #endif
        return 0;
 }