From: Tom Rini <trini@ti.com>
Date: Tue, 6 May 2014 18:55:27 +0000 (-0400)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
X-Git-Tag: v2014.07-rc1~6
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=33b0f7b5e6665aa77ece288392774b8026a15660;hp=a1a1f6e938a9de13c353064ba80eb705ba7422e9

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 486787e147..06b7e94184 100644
--- 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