net: emaclite: Move emaclite to Kconfig

Add PHYLIB and MII dependencies and enable it by default for Microblaze.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/board/xilinx/microblaze-generic/xparameters.h b/board/xilinx/microblaze-generic/xparameters.h
index 79c87fb61803e66c81d7a1e82272d899a530bd9d..4f44427e601c3e847464f15923ac7df6f6bfaaea 100644 (file)
--- a/board/xilinx/microblaze-generic/xparameters.h
+++ b/board/xilinx/microblaze-generic/xparameters.h
@@ -44,9 +44,6 @@
 #define XILINX_SYSACE_HIGHADDR 0x4180ffff
 #define XILINX_SYSACE_MEM_WIDTH        16
 
-/* Ethernet controller is Ethernet_MAC */
-#define XILINX_EMACLITE_BASEADDR       0x40C00000
-
 /* Watchdog IP is wxi_timebase_wdt_0 */
 #define XILINX_WATCHDOG_BASEADDR       0x50000000
 #define XILINX_WATCHDOG_IRQ            1

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 5e815c6bcdcbf833f6021a9b17b03ee012de86d8..1a389615729fa8c9069d58bb760d76dfaead1fa9 100644 (file)
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -10,6 +10,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM_ETH=y
-CONFIG_PHYLIB=y
+CONFIG_XILINX_EMACLITE=y
 CONFIG_SYS_NS16550=y
 CONFIG_XILINX_UARTLITE=y

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ee153590403e40d5631a2c01c68c50d2f7bdfd44..218e1fee22c3919d14ef6eda4aecf80b5a6a9b70 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -110,6 +110,14 @@ config XILINX_AXIEMAC
        help
          This MAC is present in Xilinx Microblaze, Zynq and ZynqMP SoCs.
 
+config XILINX_EMACLITE
+       depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
+       select PHYLIB
+       select MII
+       bool "Xilinx Ethernetlite"
+       help
+         This MAC is present in Xilinx Microblaze, Zynq and ZynqMP SoCs.
+
 config ZYNQ_GEM
        depends on DM_ETH && (ARCH_ZYNQ || ARCH_ZYNQMP)
        select PHYLIB

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 924bd082f2fb5ca58301b6d4b989c7618d69582c..591aa48a99f0c5f972b8d4d5b08cf6ac0bff4939 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -42,8 +42,7 @@
 
 /* ethernet */
 #undef CONFIG_SYS_ENET
-#if defined(XILINX_EMACLITE_BASEADDR) || defined(CONFIG_OF_CONTROL)
-# define CONFIG_XILINX_EMACLITE        1
+#if defined(CONFIG_XILINX_EMACLITE)
 # define CONFIG_SYS_ENET
 #endif
 #if defined(XILINX_AXIEMAC_BASEADDR)