diff mbox

[U-Boot,v2] socfpga: Relocate arch common functions away from board

Message ID 1402385025-3514-1-git-send-email-clsee@altera.com
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Chin Liang See June 10, 2014, 7:23 a.m. UTC
To move the arch common function away from board folder to
arch/arm/cpu/armv7/socfpga folder. Its to avoid code duplication
for other non Altera dev kit which is using socfpga device.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
Cc: Pavel Machek <pavel@denx.de>
Cc: Dinh Nguyen <dinguyen@altera.com>
---
Changes for v2
- Added the purpose of the patch to commit message
---
 arch/arm/cpu/armv7/socfpga/misc.c       |   24 ++++++++++++++++++++++++
 board/altera/socfpga/socfpga_cyclone5.c |   23 -----------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

Comments

Detlev Zundel June 12, 2014, 9:02 a.m. UTC | #1
Hi Chin,

> To move the arch common function away from board folder to
> arch/arm/cpu/armv7/socfpga folder. Its to avoid code duplication
> for other non Altera dev kit which is using socfpga device.

This looks like a good first step.  I'm sure that followup patches are
neccessary to clean up the division between generic and board specific
patches, but we'll see this once other boards (like socrates) are added.

Pavel, can you rebase your intended change on this?  Thanks!

Acked-by: Detlev Zundel <dzu@denx.de>
Chin Liang See June 19, 2014, 1:31 a.m. UTC | #2
On Thu, 2014-06-12 at 11:02 +0200, Detlev Zundel wrote:
> Hi Chin,
> 
> > To move the arch common function away from board folder to
> > arch/arm/cpu/armv7/socfpga folder. Its to avoid code duplication
> > for other non Altera dev kit which is using socfpga device.
> 
> This looks like a good first step.  I'm sure that followup patches are
> neccessary to clean up the division between generic and board specific
> patches, but we'll see this once other boards (like socrates) are added.
> 
> Pavel, can you rebase your intended change on this?  Thanks!
> 
> Acked-by: Detlev Zundel <dzu@denx.de>
> 

Thanks Detlev.


Hi Albert,

Can you help to apply this patch?
Thanks

Chin Liang
Albert ARIBAUD July 5, 2014, 7:17 a.m. UTC | #3
Hi Chin,

On Wed, 18 Jun 2014 20:31:17 -0500, Chin Liang See <clsee@altera.com>
wrote:

> On Thu, 2014-06-12 at 11:02 +0200, Detlev Zundel wrote:
> > Hi Chin,
> > 
> > > To move the arch common function away from board folder to
> > > arch/arm/cpu/armv7/socfpga folder. Its to avoid code duplication
> > > for other non Altera dev kit which is using socfpga device.
> > 
> > This looks like a good first step.  I'm sure that followup patches are
> > neccessary to clean up the division between generic and board specific
> > patches, but we'll see this once other boards (like socrates) are added.
> > 
> > Pavel, can you rebase your intended change on this?  Thanks!
> > 
> > Acked-by: Detlev Zundel <dzu@denx.de>
> > 
> 
> Thanks Detlev.
> 
> 
> Hi Albert,
> 
> Can you help to apply this patch?
> Thanks

Scheduled for application once 2014-07 is out.

> Chin Liang

Amicalement,
Albert ARIBAUD July 5, 2014, 8:15 a.m. UTC | #4
Hi Chin,

On Tue, 10 Jun 2014 02:23:45 -0500, Chin Liang See <clsee@altera.com>
wrote:

> To move the arch common function away from board folder to
> arch/arm/cpu/armv7/socfpga folder. Its to avoid code duplication
> for other non Altera dev kit which is using socfpga device.
> 
> Signed-off-by: Chin Liang See <clsee@altera.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Detlev Zundel <dzu@denx.de>
> Cc: Pavel Machek <pavel@denx.de>
> Cc: Dinh Nguyen <dinguyen@altera.com>
> ---
> Changes for v2
> - Added the purpose of the patch to commit message
> ---
>  arch/arm/cpu/armv7/socfpga/misc.c       |   24 ++++++++++++++++++++++++
>  board/altera/socfpga/socfpga_cyclone5.c |   23 -----------------------
>  2 files changed, 24 insertions(+), 23 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c
> index 2f1c716..5268f2c 100644
> --- a/arch/arm/cpu/armv7/socfpga/misc.c
> +++ b/arch/arm/cpu/armv7/socfpga/misc.c
> @@ -14,3 +14,27 @@ int dram_init(void)
>  	gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
>  	return 0;
>  }
> +
> +#if defined(CONFIG_DISPLAY_CPUINFO)
> +/*
> + * Print CPU information
> + */
> +int print_cpuinfo(void)
> +{
> +	puts("CPU   : Altera SOCFPGA Platform\n");
> +	return 0;
> +}
> +#endif
> +
> +#if defined(CONFIG_SYS_CONSOLE_IS_IN_ENV) && \
> +defined(CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE)
> +int overwrite_console(void)
> +{
> +	return 0;
> +}
> +#endif
> +
> +int misc_init_r(void)
> +{
> +	return 0;
> +}
> diff --git a/board/altera/socfpga/socfpga_cyclone5.c b/board/altera/socfpga/socfpga_cyclone5.c
> index a960eb6..f366565 100644
> --- a/board/altera/socfpga/socfpga_cyclone5.c
> +++ b/board/altera/socfpga/socfpga_cyclone5.c
> @@ -12,17 +12,6 @@
>  
>  DECLARE_GLOBAL_DATA_PTR;
>  
> -#if defined(CONFIG_DISPLAY_CPUINFO)
> -/*
> - * Print CPU information
> - */
> -int print_cpuinfo(void)
> -{
> -	puts("CPU   : Altera SOCFPGA Platform\n");
> -	return 0;
> -}
> -#endif
> -
>  /*
>   * Print Board information
>   */
> @@ -49,18 +38,6 @@ int board_init(void)
>  	return 0;
>  }
>  
> -int misc_init_r(void)
> -{
> -	return 0;
> -}
> -
> -#if defined(CONFIG_SYS_CONSOLE_IS_IN_ENV) && defined(CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE)
> -int overwrite_console(void)
> -{
> -	return 0;
> -}
> -#endif
> -
>  /*
>   * DesignWare Ethernet initialization
>   */

Applied to u-boot-arm/master, thanks!

Amicalement,
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c
index 2f1c716..5268f2c 100644
--- a/arch/arm/cpu/armv7/socfpga/misc.c
+++ b/arch/arm/cpu/armv7/socfpga/misc.c
@@ -14,3 +14,27 @@  int dram_init(void)
 	gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
 	return 0;
 }
+
+#if defined(CONFIG_DISPLAY_CPUINFO)
+/*
+ * Print CPU information
+ */
+int print_cpuinfo(void)
+{
+	puts("CPU   : Altera SOCFPGA Platform\n");
+	return 0;
+}
+#endif
+
+#if defined(CONFIG_SYS_CONSOLE_IS_IN_ENV) && \
+defined(CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE)
+int overwrite_console(void)
+{
+	return 0;
+}
+#endif
+
+int misc_init_r(void)
+{
+	return 0;
+}
diff --git a/board/altera/socfpga/socfpga_cyclone5.c b/board/altera/socfpga/socfpga_cyclone5.c
index a960eb6..f366565 100644
--- a/board/altera/socfpga/socfpga_cyclone5.c
+++ b/board/altera/socfpga/socfpga_cyclone5.c
@@ -12,17 +12,6 @@ 
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_DISPLAY_CPUINFO)
-/*
- * Print CPU information
- */
-int print_cpuinfo(void)
-{
-	puts("CPU   : Altera SOCFPGA Platform\n");
-	return 0;
-}
-#endif
-
 /*
  * Print Board information
  */
@@ -49,18 +38,6 @@  int board_init(void)
 	return 0;
 }
 
-int misc_init_r(void)
-{
-	return 0;
-}
-
-#if defined(CONFIG_SYS_CONSOLE_IS_IN_ENV) && defined(CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE)
-int overwrite_console(void)
-{
-	return 0;
-}
-#endif
-
 /*
  * DesignWare Ethernet initialization
  */