summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Linz <linz@li-pro.net>2012-02-25 00:48:32 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-04-04 09:36:35 -0500
commit8422a35e9bb4c1c9947258a29d7020a673cf7a2e (patch)
tree16b65fc5480fba4bbf94d0f92240bb5076a05f34
parentdf48265036dc7332d488ded34aa298f7f5bf3513 (diff)
microblaze: Enable several ethernet driver compilation
U-Boot's multipple network supports enables to use several ethernet drivers but microblaze-generic platform config file select only one driver. Reported-by: Michal Simek <monstr@monstr.eu> Signed-off-by: Stephan Linz <linz@li-pro.net>
-rw-r--r--include/configs/microblaze-generic.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 9f66fbfc3f..efca13608b 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -65,11 +65,12 @@
/* ethernet */
#undef CONFIG_SYS_ENET
-#ifdef XILINX_EMACLITE_BASEADDR
-# define CONFIG_XILINX_EMACLITE 1
+#if defined(XILINX_EMACLITE_BASEADDR)
+# define CONFIG_XILINX_EMACLITE 1
# define CONFIG_SYS_ENET
-#elif XILINX_LLTEMAC_BASEADDR
-# define CONFIG_XILINX_LL_TEMAC 1
+#endif
+#if defined(XILINX_LLTEMAC_BASEADDR)
+# define CONFIG_XILINX_LL_TEMAC 1
# define CONFIG_SYS_ENET
#endif
#if defined(XILINX_AXIEMAC_BASEADDR)
@@ -339,7 +340,7 @@
#define CONFIG_FIT 1
#define CONFIG_OF_LIBFDT 1
-#if defined(CONFIG_XILINX_AXIEMAC)
+#if defined(CONFIG_XILINX_LL_TEMAC) || defined(CONFIG_XILINX_AXIEMAC)
# define CONFIG_MII 1
# define CONFIG_CMD_MII 1
# define CONFIG_PHY_GIGE 1