summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-05-06 14:55:27 -0400
committerTom Rini <trini@ti.com>2014-05-06 14:55:27 -0400
commit33b0f7b5e6665aa77ece288392774b8026a15660 (patch)
tree482624854a899cda934a3dc8271e30386fa77547
parenta1a1f6e938a9de13c353064ba80eb705ba7422e9 (diff)
parentd1d37b5cab119096bb60c686eff7ea39cfebed25 (diff)
downloadtalos-obmc-uboot-33b0f7b5e6665aa77ece288392774b8026a15660.tar.gz
talos-obmc-uboot-33b0f7b5e6665aa77ece288392774b8026a15660.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
-rw-r--r--include/configs/microblaze-generic.h2
1 files changed, 1 insertions, 1 deletions
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
OpenPOWER on IntegriCloud