diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-29 06:46:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-29 06:46:03 -0400 |
| commit | 1692515e51a190b2ad1e2c54fdaa15fbb8387ba7 (patch) | |
| tree | 81bc4c3e3ba46831da8aca2d08c7ac07dbe9c7ce | |
| parent | 536266231a340c0c5e571e1012bf3f8fc835b251 (diff) | |
| parent | 127e8a5e4361843dc43cf2f523c66071bbbb9c90 (diff) | |
| download | u-boot-imx-1692515e51a190b2ad1e2c54fdaa15fbb8387ba7.zip u-boot-imx-1692515e51a190b2ad1e2c54fdaa15fbb8387ba7.tar.gz u-boot-imx-1692515e51a190b2ad1e2c54fdaa15fbb8387ba7.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
| -rw-r--r-- | board/xilinx/microblaze-generic/microblaze-generic.c | 2 |
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 |