summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOvidiu Panait <ovidiu.panait@windriver.com>2020-07-24 14:12:13 +0300
committerTom Rini <trini@konsulko.com>2020-08-06 14:26:35 -0400
commit6ecefcfb6d0cfdd0c34db5d25ed58859eb266416 (patch)
treea166e8b34a8662a9c805950038d6384870c8f95c
parent9a17bfb6420bb5de1781b37b5a423f41aab29000 (diff)
downloadu-boot-6ecefcfb6d0cfdd0c34db5d25ed58859eb266416.tar.gz
u-boot-6ecefcfb6d0cfdd0c34db5d25ed58859eb266416.tar.bz2
u-boot-6ecefcfb6d0cfdd0c34db5d25ed58859eb266416.zip
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>
-rw-r--r--arch/m68k/lib/bdinfo.c4
-rw-r--r--arch/powerpc/lib/bdinfo.c4
-rw-r--r--cmd/bdinfo.c4
3 files changed, 4 insertions, 8 deletions
diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index fb4d1a52fd..b7bc6a3044 100644
--- 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 75611e2592..07f823ee7a 100644
--- 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 9485c40474..9593b345a3 100644
--- 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);