From: Nathan Rossi Date: Tue, 14 Apr 2015 06:16:39 +0000 (+1000) Subject: microblaze: Fix EMAC Lite initialization X-Git-Tag: v2015.07-rc1~60^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=127e8a5e4361843dc43cf2f523c66071bbbb9c90;p=oweals%2Fu-boot.git 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 Signed-off-by: Michal Simek --- diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index 3110405a1b..375cd0b6fe 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