[U-Boot] [PATCH] microblaze: Fix EMAC Lite initialization

[U-Boot] [PATCH] microblaze: Fix EMAC Lite initialization

[Nathan Rossi]

It is possible for CONFIG_XILINX_EMACLITE to be defined without
XILINX_EMACLITE_BASEADDR being defined as the EMAC Lite driver support
OF init. Check that the driver is enabled and the base address is
available before initializing with a static base address.

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
---
 board/xilinx/microblaze-generic/microblaze-generic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 3110405..375cd0b 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -109,7 +109,7 @@ int board_eth_init(bd_t *bis)
 						XILINX_AXIDMA_BASEADDR);
 #endif
 
-#ifdef CONFIG_XILINX_EMACLITE
+#if defined(CONFIG_XILINX_EMACLITE) && defined(XILINX_EMACLITE_BASEADDR)
 	u32 txpp = 0;
 	u32 rxpp = 0;
 # ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG
-- 
1.7.10.4

[U-Boot] [PATCH] microblaze: Fix EMAC Lite initialization

[Michal Simek]

On 04/14/2015 08:16 AM, Nathan Rossi wrote:
> It is possible for CONFIG_XILINX_EMACLITE to be defined without
> XILINX_EMACLITE_BASEADDR being defined as the EMAC Lite driver support
> OF init. Check that the driver is enabled and the base address is
> available before initializing with a static base address.
> 
> Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
> ---
>  board/xilinx/microblaze-generic/microblaze-generic.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
> index 3110405..375cd0b 100644
> --- a/board/xilinx/microblaze-generic/microblaze-generic.c
> +++ b/board/xilinx/microblaze-generic/microblaze-generic.c
> @@ -109,7 +109,7 @@ int board_eth_init(bd_t *bis)
>  						XILINX_AXIDMA_BASEADDR);
>  #endif
>  
> -#ifdef CONFIG_XILINX_EMACLITE
> +#if defined(CONFIG_XILINX_EMACLITE) && defined(XILINX_EMACLITE_BASEADDR)
>  	u32 txpp = 0;
>  	u32 rxpp = 0;
>  # ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG
> 

Applied.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150415/96d206fb/attachment.sig>