Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@ti.com>
Tue, 6 May 2014 18:55:27 +0000 (14:55 -0400)
committerTom Rini <trini@ti.com>
Tue, 6 May 2014 18:55:27 +0000 (14:55 -0400)
include/configs/microblaze-generic.h

index 486787e..06b7e94 100644 (file)
@@ -71,7 +71,7 @@
 
 /* ethernet */
 #undef CONFIG_SYS_ENET
-#if defined(XILINX_EMACLITE_BASEADDR)
+#if defined(XILINX_EMACLITE_BASEADDR) || defined(CONFIG_OF_CONTROL)
 # define CONFIG_XILINX_EMACLITE        1
 # define CONFIG_SYS_ENET
 #endif