Skip to contentSkip to conversation

microblaze: Fix EMAC Lite initialization

PATCH New Nathan Rossi 2 participants 2 messages Apr 14, 2015 – Apr 15, 2015 Arm/Zynq architecture

lore
Share & tools
lore

Nathan Rossi

author
#0 lore raw

PATCH 1/1 microblaze: Fix EMAC Lite initialization

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 <[email protected]>
---
 board/xilinx/microblaze-generic/microblaze-generic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/xilinx/microblaze-generic/microblaze-generic.c +1 -1
index 3110405..375cd0b 100644
@@ -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
Signature · 1 line
1.7.10.4
Applied
#1 lore raw

PATCH 1/1 microblaze: Fix EMAC Lite initialization

Quoted 16 lines · 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 <[email protected]>
---
 board/xilinx/microblaze-generic/microblaze-generic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/xilinx/microblaze-generic/microblaze-generic.c +0 -0
index 3110405..375cd0b 100644

board/xilinx/microblaze-generic/microblaze-generic.c int board_eth_init(bd_t *bis) · line 115

Quoted 8 lines
board/xilinx/microblaze-generic/microblaze-generic.c +1 -1
@@ -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

Signature · 14 lines
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>