summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2015-04-14 16:16:39 +1000
committerMichal Simek <michal.simek@xilinx.com>2015-04-29 10:22:25 +0200
commit127e8a5e4361843dc43cf2f523c66071bbbb9c90 (patch)
tree1fbe219aa6588e161768081c99b00c295693add9
parentcc555bd4f40a652471df4a3621d45ee57df0ca11 (diff)
downloadu-boot-imx-127e8a5e4361843dc43cf2f523c66071bbbb9c90.zip
u-boot-imx-127e8a5e4361843dc43cf2f523c66071bbbb9c90.tar.gz
u-boot-imx-127e8a5e4361843dc43cf2f523c66071bbbb9c90.tar.bz2
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 <nathan.rossi@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r--board/xilinx/microblaze-generic/microblaze-generic.c2
1 files changed, 1 insertions, 1 deletions
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