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

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 486787e1479694b9c52c94084afc1c71eb3eb449..06b7e94184e74dc7bcea12a461308fa6fcf9bfd2 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -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