cmd: bdinfo: Move sram info prints to generic code

bi_sramstart and bi_sramsize are generic members of the bd_info structure,
so move the m68k/powerpc-specific prints to generic code. Also, print them
only if SRAM support is enabled via CONFIG_SYS_HAS_SRAM.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>

diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index fb4d1a5..b7bc6a3 100644 (file)
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@@ -15,10 +15,6 @@ void arch_print_bdinfo(void)
 {
        struct bd_info *bd = gd->bd;
 
-#if defined(CONFIG_SYS_INIT_RAM_ADDR)
-       bdinfo_print_num("sramstart", (ulong)bd->bi_sramstart);
-       bdinfo_print_num("sramsize", (ulong)bd->bi_sramsize);
-#endif
        bdinfo_print_mhz("busfreq", bd->bi_busfreq);
 #if defined(CONFIG_SYS_MBAR)
        bdinfo_print_num("mbar", bd->bi_mbar_base);

diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index 75611e2..07f823e 100644 (file)
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -20,10 +20,6 @@ void arch_print_bdinfo(void)
 {
        struct bd_info *bd = gd->bd;
 
-#if defined(CONFIG_SYS_INIT_RAM_ADDR)
-       bdinfo_print_num("sramstart", (ulong)bd->bi_sramstart);
-       bdinfo_print_num("sramsize", (ulong)bd->bi_sramsize);
-#endif
        bdinfo_print_mhz("busfreq", bd->bi_busfreq);
 #if defined(CONFIG_MPC8xx) || defined(CONFIG_E500)
        bdinfo_print_num("immr_base", bd->bi_immr_base);

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 9485c40..9593b34 100644 (file)
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -77,6 +77,10 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
        print_bi_dram(bd);
        bdinfo_print_num("memstart", (ulong)bd->bi_memstart);
        print_phys_addr("memsize", bd->bi_memsize);
+       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("flashstart", (ulong)bd->bi_flashstart);
        bdinfo_print_num("flashsize", (ulong)bd->bi_flashsize);
        bdinfo_print_num("flashoffset", (ulong)bd->bi_flashoffset);