diff mbox series

[33/36] bdinfo: m68k: ppc: Move arch-specific code from bdinfo

Message ID 20200504231732.98778-25-sjg@chromium.org
State Superseded
Headers show
Series Tidy up the 'bd' command. | expand

Commit Message

Simon Glass May 4, 2020, 11:17 p.m. UTC
We don't have an easy way to share these three lines of code with two
architectures. We also want to make it clear that this code is actually
arch-specific.

So just duplicate it in each arch-specific file.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 arch/m68k/lib/bdinfo.c    | 5 +++++
 arch/powerpc/lib/bdinfo.c | 5 +++++
 cmd/bdinfo.c              | 8 --------
 3 files changed, 10 insertions(+), 8 deletions(-)

Comments

Bin Meng May 6, 2020, 8:10 a.m. UTC | #1
On Tue, May 5, 2020 at 7:19 AM Simon Glass <sjg at chromium.org> wrote:
>
> We don't have an easy way to share these three lines of code with two
> architectures. We also want to make it clear that this code is actually
> arch-specific.
>
> So just duplicate it in each arch-specific file.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
>  arch/m68k/lib/bdinfo.c    | 5 +++++
>  arch/powerpc/lib/bdinfo.c | 5 +++++
>  cmd/bdinfo.c              | 8 --------
>  3 files changed, 10 insertions(+), 8 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
Stefan Roese May 6, 2020, 3:10 p.m. UTC | #2
On 05.05.20 01:17, Simon Glass wrote:
> We don't have an easy way to share these three lines of code with two
> architectures. We also want to make it clear that this code is actually
> arch-specific.
> 
> So just duplicate it in each arch-specific file.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
> 
>   arch/m68k/lib/bdinfo.c    | 5 +++++
>   arch/powerpc/lib/bdinfo.c | 5 +++++
>   cmd/bdinfo.c              | 8 --------
>   3 files changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
> index 09a1abfc21..971c47c306 100644
> --- a/arch/m68k/lib/bdinfo.c
> +++ b/arch/m68k/lib/bdinfo.c
> @@ -15,6 +15,11 @@ void arch_print_bdinfo(void)
>   {
>   	bd_t *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);
>   #endif
> diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
> index da09bb276f..d8c64155f0 100644
> --- a/arch/powerpc/lib/bdinfo.c
> +++ b/arch/powerpc/lib/bdinfo.c
> @@ -20,6 +20,11 @@ void arch_print_bdinfo(void)
>   {
>   	bd_t *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);
>   #endif
> diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
> index f0afdb153f..aea7cf904a 100644
> --- a/cmd/bdinfo.c
> +++ b/cmd/bdinfo.c
> @@ -98,14 +98,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
>   
>   	arch_print_bdinfo();
>   
> -	/* This is used by m68k and ppc */
> -#if defined(CONFIG_SYS_INIT_RAM_ADDR)
> -	bdinfo_print_num("sramstart", (ulong)bd->bi_sramstart);
> -	bdinfo_print_num("sramsize", (ulong)bd->bi_sramsize);
> -#endif
> -	if (IS_ENABLED(CONFIG_PPC) || IS_ENABLED(CONFIG_M68K))
> -		bdinfo_print_mhz("busfreq", bd->bi_busfreq);
> -
>   	return 0;
>   }
>   
> 


Viele Gr??e,
Stefan
diff mbox series

Patch

diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index 09a1abfc21..971c47c306 100644
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@@ -15,6 +15,11 @@  void arch_print_bdinfo(void)
 {
 	bd_t *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);
 #endif
diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index da09bb276f..d8c64155f0 100644
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -20,6 +20,11 @@  void arch_print_bdinfo(void)
 {
 	bd_t *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);
 #endif
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index f0afdb153f..aea7cf904a 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -98,14 +98,6 @@  int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 
 	arch_print_bdinfo();
 
-	/* This is used by m68k and ppc */
-#if defined(CONFIG_SYS_INIT_RAM_ADDR)
-	bdinfo_print_num("sramstart", (ulong)bd->bi_sramstart);
-	bdinfo_print_num("sramsize", (ulong)bd->bi_sramsize);
-#endif
-	if (IS_ENABLED(CONFIG_PPC) || IS_ENABLED(CONFIG_M68K))
-		bdinfo_print_mhz("busfreq", bd->bi_busfreq);
-
 	return 0;
 }