[U-Boot] [PATCH v3 00/10] sunxi: Bug fixes, sun4i and sun5i support and network improvements

[Hans de Goede]

Hi Ian,

On 07/06/2014 09:12 PM, Ian Campbell wrote:
> On Mon, 2014-06-09 at 11:36 +0200, Hans de Goede wrote:
>> Here is v2 of my patch series to be applied on top of Ian's recently merged
>> basic sun7i support.
> 
> For the A13-OLinuXinoM and r7-tv-dongle with this series I'm seeing:
> 
> arch/arm/cpu/armv7/sunxi/board.c: In function ‘cpu_eth_init’:
> arch/arm/cpu/armv7/sunxi/board.c:118:6: warning: unused variable
> ‘rc’ [-Wunused-variable]
>   int rc;
>       ^
> because they both have neither EMAC or GMAC. This resolves it:
> 
> 8<------------------
> 
> From 4eed69132de51d07586e7b070eda72297825a674 Mon Sep 17 00:00:00 2001
> From: Ian Campbell <ijc at hellion.org.uk>
> Date: Sun, 6 Jul 2014 20:03:20 +0100
> Subject: [PATCH] sunxi: Avoid unused variable warning
> 
> Signed-off-by: Ian Campbell <ijc at hellion.org.uk>
> ---
>  arch/arm/cpu/armv7/sunxi/board.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c
> index 1e506b5..f8db9e8 100644
> --- a/arch/arm/cpu/armv7/sunxi/board.c
> +++ b/arch/arm/cpu/armv7/sunxi/board.c
> @@ -115,7 +115,9 @@ void enable_caches(void)
>   */
>  int cpu_eth_init(bd_t *bis)
>  {
> +#if defined(CONFIG_SUNXI_EMAC) || defined(CONFIG_SUNXI_GMAC)
>  	int rc;
> +#endif
>  
>  #ifdef CONFIG_SUNXI_EMAC
>  	rc = sunxi_emac_initialize(bis);

AFAIK we will never define both EMAC and GMAC for the same board,
so IMHO a better fix would be to change this line:

  	rc = sunxi_emac_initialize(bis);

to:

  	int rc = sunxi_emac_initialize(bis);

And the same for gmac.

Regards,

Hans