bdinfo: Rename function names to be clearer

At present we have bdinfo_print_num() to print unsigned long numbers.
We also have print_phys_addr() which accept numbers that might be
64-bit on a 32-bit platform.

Rename these 2 functions to be clearer:

bdinfo_print_num() => bdinfo_print_num_l()
print_phys_addr()  => bdinfo_print_num_ll()

While we are here, make bdinfo_print_num_ll() public so that it can
be used outside cmd/bdinfo.c in the future.

Signed-off-by: Bin Meng <bin.meng@windriver.com>

diff --git a/arch/arm/lib/bdinfo.c b/arch/arm/lib/bdinfo.c
index 25bc6e80f4760ecf9087b704f94843e537225894..4a98cb7ef59bb00e10f64f0201bb004f97bed5d6 100644 (file)
--- a/arch/arm/lib/bdinfo.c
+++ b/arch/arm/lib/bdinfo.c
@@ -15,23 +15,23 @@ void arch_print_bdinfo(void)
 {
        struct bd_info *bd = gd->bd;
 
-       bdinfo_print_num("arch_number", bd->bi_arch_number);
+       bdinfo_print_num_l("arch_number", bd->bi_arch_number);
 #ifdef CONFIG_SYS_MEM_RESERVE_SECURE
        if (gd->arch.secure_ram & MEM_RESERVE_SECURE_SECURED) {
-               bdinfo_print_num("Secure ram",
-                                gd->arch.secure_ram &
-                                MEM_RESERVE_SECURE_ADDR_MASK);
+               bdinfo_print_num_l("Secure ram",
+                                  gd->arch.secure_ram &
+                                  MEM_RESERVE_SECURE_ADDR_MASK);
        }
 #endif
 #ifdef CONFIG_RESV_RAM
        if (gd->arch.resv_ram)
-               bdinfo_print_num("Reserved ram", gd->arch.resv_ram);
+               bdinfo_print_num_l("Reserved ram", gd->arch.resv_ram);
 #endif
 #if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
-       bdinfo_print_num("TLB addr", gd->arch.tlb_addr);
+       bdinfo_print_num_l("TLB addr", gd->arch.tlb_addr);
 #endif
-       bdinfo_print_num("irq_sp", gd->irq_sp); /* irq stack pointer */
-       bdinfo_print_num("sp start ", gd->start_addr_sp);
+       bdinfo_print_num_l("irq_sp", gd->irq_sp);       /* irq stack pointer */
+       bdinfo_print_num_l("sp start ", gd->start_addr_sp);
        /*
         * TODO: Currently only support for davinci SOC's is added.
         * Remove this check once all the board implement this.

diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index 404e5f19ed82f1214e42c7522b90496145d08d6a..92ea1752023f66aa5f0070d19b3c3932c3e91e37 100644 (file)
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@@ -38,7 +38,7 @@ void arch_print_bdinfo(void)
 
        bdinfo_print_mhz("busfreq", bd->bi_busfreq);
 #if defined(CONFIG_SYS_MBAR)
-       bdinfo_print_num("mbar", bd->bi_mbar_base);
+       bdinfo_print_num_l("mbar", bd->bi_mbar_base);
 #endif
        bdinfo_print_mhz("cpufreq", bd->bi_intfreq);
        if (IS_ENABLED(CONFIG_PCI))

diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index 36c9c99ee6ff8126c3f9bf2ed6a764b68b78f734..b14e75b68abd859515629aeadb9bb65ba2e960de 100644 (file)
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -47,9 +47,9 @@ void arch_print_bdinfo(void)
 
        bdinfo_print_mhz("busfreq", bd->bi_busfreq);
 #if defined(CONFIG_MPC8xx) || defined(CONFIG_E500)
-       bdinfo_print_num("immr_base", bd->bi_immr_base);
+       bdinfo_print_num_l("immr_base", bd->bi_immr_base);
 #endif
-       bdinfo_print_num("bootflags", bd->bi_bootflags);
+       bdinfo_print_num_l("bootflags", bd->bi_bootflags);
        bdinfo_print_mhz("intfreq", bd->bi_intfreq);
 #ifdef CONFIG_ENABLE_36BIT_PHYS
        if (IS_ENABLED(CONFIG_PHYS_64BIT))

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 8d8daa6336afebc080cbb7ddf4854ee3337d1197..996546faf32cf380c7f3e6bd87405637495784a2 100644 (file)
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -18,11 +18,16 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void bdinfo_print_num(const char *name, ulong value)
+void bdinfo_print_num_l(const char *name, ulong value)
 {
        printf("%-12s= 0x%0*lx\n", name, 2 * (int)sizeof(value), value);
 }
 
+void bdinfo_print_num_ll(const char *name, unsigned long long value)
+{
+       printf("%-12s= 0x%.*llx\n", name, 2 * (int)sizeof(ulong), value);
+}
+
 static void print_eth(int idx)
 {
        char name[10], *val;
@@ -36,12 +41,6 @@ static void print_eth(int idx)
        printf("%-12s= %s\n", name, val);
 }
 
-static void print_phys_addr(const char *name, phys_addr_t value)
-{
-       printf("%-12s= 0x%.*llx\n", name, 2 * (int)sizeof(ulong),
-              (unsigned long long)value);
-}
-
 void bdinfo_print_mhz(const char *name, unsigned long hz)
 {
        char buf[32];
@@ -55,9 +54,9 @@ static void print_bi_dram(const struct bd_info *bd)
 
        for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) {
                if (bd->bi_dram[i].size) {
-                       bdinfo_print_num("DRAM bank",   i);
-                       bdinfo_print_num("-> start",    bd->bi_dram[i].start);
-                       bdinfo_print_num("-> size",     bd->bi_dram[i].size);
+                       bdinfo_print_num_l("DRAM bank", i);
+                       bdinfo_print_num_l("-> start",  bd->bi_dram[i].start);
+                       bdinfo_print_num_l("-> size",   bd->bi_dram[i].size);
                }
        }
 }
@@ -77,9 +76,10 @@ static void show_video_info(void)
                if (device_active(dev)) {
                        struct video_priv *upriv = dev_get_uclass_priv(dev);
 
-                       print_phys_addr("FB base", (ulong)upriv->fb);
+                       bdinfo_print_num_ll("FB base", (ulong)upriv->fb);
                        if (upriv->copy_fb)
-                               print_phys_addr("FB copy", (ulong)upriv->copy_fb);
+                               bdinfo_print_num_ll("FB copy",
+                                                   (ulong)upriv->copy_fb);
                        printf("%-12s= %dx%dx%d\n", "FB size", upriv->xsize,
                               upriv->ysize, 1 << upriv->bpix);
                }
@@ -91,36 +91,36 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
        struct bd_info *bd = gd->bd;
 
 #ifdef DEBUG
-       bdinfo_print_num("bd address", (ulong)bd);
+       bdinfo_print_num_l("bd address", (ulong)bd);
 #endif
-       bdinfo_print_num("boot_params", (ulong)bd->bi_boot_params);
+       bdinfo_print_num_l("boot_params", (ulong)bd->bi_boot_params);
        print_bi_dram(bd);
        if (IS_ENABLED(CONFIG_SYS_HAS_SRAM)) {
-               bdinfo_print_num("sramstart", (ulong)bd->bi_sramstart);
-               bdinfo_print_num("sramsize", (ulong)bd->bi_sramsize);
+               bdinfo_print_num_l("sramstart", (ulong)bd->bi_sramstart);
+               bdinfo_print_num_l("sramsize", (ulong)bd->bi_sramsize);
        }
-       bdinfo_print_num("flashstart", (ulong)bd->bi_flashstart);
-       bdinfo_print_num("flashsize", (ulong)bd->bi_flashsize);
-       bdinfo_print_num("flashoffset", (ulong)bd->bi_flashoffset);
+       bdinfo_print_num_l("flashstart", (ulong)bd->bi_flashstart);
+       bdinfo_print_num_l("flashsize", (ulong)bd->bi_flashsize);
+       bdinfo_print_num_l("flashoffset", (ulong)bd->bi_flashoffset);
        printf("baudrate    = %u bps\n", gd->baudrate);
-       bdinfo_print_num("relocaddr", gd->relocaddr);
-       bdinfo_print_num("reloc off", gd->reloc_off);
+       bdinfo_print_num_l("relocaddr", gd->relocaddr);
+       bdinfo_print_num_l("reloc off", gd->reloc_off);
        printf("%-12s= %u-bit\n", "Build", (uint)sizeof(void *) * 8);
        if (IS_ENABLED(CONFIG_CMD_NET)) {
                printf("current eth = %s\n", eth_get_name());
                print_eth(0);
                printf("IP addr     = %s\n", env_get("ipaddr"));
        }
-       bdinfo_print_num("fdt_blob", (ulong)gd->fdt_blob);
-       bdinfo_print_num("new_fdt", (ulong)gd->new_fdt);
-       bdinfo_print_num("fdt_size", (ulong)gd->fdt_size);
+       bdinfo_print_num_l("fdt_blob", (ulong)gd->fdt_blob);
+       bdinfo_print_num_l("new_fdt", (ulong)gd->new_fdt);
+       bdinfo_print_num_l("fdt_size", (ulong)gd->fdt_size);
        if (IS_ENABLED(CONFIG_DM_VIDEO))
                show_video_info();
 #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
-       bdinfo_print_num("FB base  ", gd->fb_base);
+       bdinfo_print_num_l("FB base  ", gd->fb_base);
 #endif
 #if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
-       bdinfo_print_num("multi_dtb_fit", (ulong)gd->multi_dtb_fit);
+       bdinfo_print_num_l("multi_dtb_fit", (ulong)gd->multi_dtb_fit);
 #endif
        if (gd->fdt_blob) {
                struct lmb lmb;

diff --git a/include/init.h b/include/init.h
index 980be2799369cf23381176d1d5947199ea5c5bf3..88f84599e9ecfdac3832f176c7aa5338cb31672f 100644 (file)
--- a/include/init.h
+++ b/include/init.h
@@ -326,7 +326,8 @@ void relocate_code(ulong start_addr_sp, struct global_data *new_gd,
 #endif
 
 /* Print a numeric value (for use in arch_print_bdinfo()) */
-void bdinfo_print_num(const char *name, ulong value);
+void bdinfo_print_num_l(const char *name, ulong value);
+void bdinfo_print_num_ll(const char *name, unsigned long long value);
 
 /* Print a clock speed in MHz */
 void bdinfo_print_mhz(const char *name, unsigned long hz);