summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-10-28 00:14:16 +0200
committerWolfgang Denk <wd@denx.de>2011-10-28 00:14:16 +0200
commit606a76f8ef479e42ae4d06f8f3ce87e9a1c72acf (patch)
tree0308f6a10f937f8603f73c07568b68bcd6208b49 /include
parent88a85fb9f3578f513d7053ac9a3f1ff7521b2771 (diff)
parent1fbd0c36daeb2340210bbd68ee2f62f26a8bdfa0 (diff)
downloadu-boot-imx-606a76f8ef479e42ae4d06f8f3ce87e9a1c72acf.zip
u-boot-imx-606a76f8ef479e42ae4d06f8f3ce87e9a1c72acf.tar.gz
u-boot-imx-606a76f8ef479e42ae4d06f8f3ce87e9a1c72acf.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
* 'master' of git://git.denx.de/u-boot-microblaze: microblaze: Fix strict-aliasing rules for in_be32 microblaze: Wire up axi_ethernet driver initialization
Diffstat (limited to 'include')
-rw-r--r--include/configs/microblaze-generic.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 09ff7c4..6b3fd76 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -68,6 +68,10 @@
# define CONFIG_XILINX_LL_TEMAC 1
# define CONFIG_SYS_ENET
#endif
+#if defined(XILINX_AXIEMAC_BASEADDR)
+# define CONFIG_XILINX_AXIEMAC 1
+# define CONFIG_SYS_ENET
+#endif
#undef ET_DEBUG