Merge tag 'arc-fixes-for-2020.07-rc3' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / cmd / bdinfo.c

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index abd9151432ed945e161a50ac54107cad1b0232f9..9edcf8d74ebb583b9a3ba7c8bf74c443bb550fa0 100644 (file)
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -15,6 +15,11 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+__maybe_unused void print_cpu_word_size(void)
+{
+       printf("%-12s= %u-bit\n", "Build", (uint)sizeof(void *) * 8);
+}
+
 __maybe_unused
 static void print_num(const char *name, ulong value)
 {
@@ -208,6 +213,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_baudrate();
        print_num("relocaddr", gd->relocaddr);
        board_detail();
+       print_cpu_word_size();
+
        return 0;
 }
 
@@ -227,6 +234,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        print_eth_ip_addr();
        print_baudrate();
+       print_cpu_word_size();
 
        return 0;
 }
@@ -252,6 +260,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_num("fdt_blob", (ulong)gd->fdt_blob);
        print_num("new_fdt", (ulong)gd->new_fdt);
        print_num("fdt_size", (ulong)gd->fdt_size);
+       print_cpu_word_size();
 
        return 0;
 }
@@ -283,6 +292,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #endif
        print_eth_ip_addr();
        print_baudrate();
+       print_cpu_word_size();
 
        return 0;
 }
@@ -294,6 +304,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_std_bdinfo(gd->bd);
        print_num("relocaddr", gd->relocaddr);
        print_num("reloc off", gd->reloc_off);
+       print_cpu_word_size();
 
        return 0;
 }
@@ -348,9 +359,13 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc,
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
        printf("Early malloc usage: %lx / %x\n", gd->malloc_ptr,
               CONFIG_VAL(SYS_MALLOC_F_LEN));
+#endif
+#if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
+       print_num("multi_dtb_fit", (ulong)gd->multi_dtb_fit);
 #endif
        if (gd->fdt_blob)
                print_num("fdt_blob", (ulong)gd->fdt_blob);
+       print_cpu_word_size();
 
        return 0;
 }
@@ -365,6 +380,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_bi_flash(bd);
        print_eth_ip_addr();
        print_baudrate();
+       print_cpu_word_size();
+
        return 0;
 }
 
@@ -385,6 +402,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_mhz("ethspeed",       bd->bi_ethspeed);
 #endif
        print_baudrate();
+       print_cpu_word_size();
 
        return 0;
 }
@@ -402,6 +420,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
        print_num("FB base  ", gd->fb_base);
 #endif
+       print_cpu_word_size();
+
        return 0;
 }
 
@@ -416,6 +436,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_bi_dram(bd);
        print_eth_ip_addr();
        print_baudrate();
+       print_cpu_word_size();
 
        return 0;
 }
@@ -432,6 +453,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_num("reloc off", gd->reloc_off);
        print_eth_ip_addr();
        print_baudrate();
+       print_cpu_word_size();
 
        return 0;
 }
@@ -445,6 +467,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_bi_mem(bd);
        print_eth_ip_addr();
        print_baudrate();
+       print_cpu_word_size();
 
        return 0;
 }