From: Michal Simek <michal.simek@xilinx.com>
Date: Wed, 9 Dec 2015 15:54:42 +0000 (+0100)
Subject: microblaze: Enable axi emac via Kconfig
X-Git-Tag: v2016.03-rc1~46^2~58
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=83b76d9ef718a31f6bff31d4abbcf886d80a45ce;p=u-boot

microblaze: Enable axi emac via Kconfig

Enable driver by default for all platforms.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 325c1bb44c..047ed1765e 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -11,6 +11,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM_ETH=y
+CONFIG_XILINX_AXIEMAC=y
 CONFIG_XILINX_EMACLITE=y
 CONFIG_SYS_NS16550=y
 CONFIG_XILINX_UARTLITE=y
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 004826e038..45a981bf48 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -42,11 +42,7 @@
 
 /* ethernet */
 #undef CONFIG_SYS_ENET
-#if defined(CONFIG_XILINX_EMACLITE)
-# define CONFIG_SYS_ENET
-#endif
-#if defined(XILINX_AXIEMAC_BASEADDR)
-# define CONFIG_XILINX_AXIEMAC	1
+#if defined(CONFIG_XILINX_EMACLITE) || defined(CONFIG_XILINX_AXIEMAC)
 # define CONFIG_SYS_ENET
 #endif