Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

1692515e · Tom Rini · 53626623 · 127e8a5e · 1692515e
Commit 1692515e authored 9 years ago by Tom Rini
--- 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