resolve merge conflict

1 files changed, 144 insertions, 40 deletions

diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index b6aad8744..b6732a971 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -1,10 +1,18 @@
 menu "Ethernet network devices support"
-comment "network driver for target system is included into kernel"
 
-config ADK_KERNEL_NET_ETHERNET
+# vendor stuff
+config ADK_KERNEL_NET_VENDOR_AMD
+	boolean
+
+config ADK_KERNEL_NET_VENDOR_IBM
+	boolean
+
+config ADK_KERNEL_NET_VENDOR_INTEL
+	boolean
+
+config ADK_KERNEL_NET_VENDOR_FREESCALE
 	boolean
 
-# vendor stuff
 config ADK_KERNEL_NET_VENDOR_NATSEMI
 	boolean
 
@@ -17,13 +25,19 @@ config ADK_KERNEL_NET_VENDOR_REALTEK
 config ADK_KERNEL_NET_VENDOR_MARVELL
 	boolean
 
-config ADK_KERNEL_PHYLIB
+config ADK_KERNEL_NET_VENDOR_VIA
 	boolean
 
-config ADK_KERNEL_MII
+config ADK_KERNEL_NET_VENDOR_SMSC
+	boolean
+
+config ADK_KERNEL_NET_VENDOR_XILINX
+	boolean
+
+config ADK_KERNEL_PHYLIB
 	boolean
 
-config ADK_KERNEL_USB_USBNET
+config ADK_KERNEL_MII
 	boolean
 
 config ADK_KERNEL_NET_PCI
@@ -35,100 +49,190 @@ config ADK_KERNEL_NETDEV_1000
 config ADK_KERNEL_VIA_RHINE_MMIO
 	boolean
 
+config ADK_KERNEL_AT803X_PHY
+	select ADK_KERNEL_PHYLIB
+	tristate
+
+config ADK_KERNEL_FEC
+	prompt "FEC ethernet driver"
+	tristate
+	select ADK_KERNEL_NET_VENDOR_FREESCALE
+	select ADK_KERNEL_AT803X_PHY
+	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default n
+	help
+	  FEC ethernet driver
+
+config ADK_KERNEL_KORINA
+	prompt "Korina ethernet driver"
+	tristate
+	default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532
+	default n
+	help
+	  Korina ethernet driver
+
 config ADK_KERNEL_USB_NET_SMSC95XX
-	boolean
-	select ADK_KERNEL_NET_ETHERNET
+	prompt "SMSC95XX USB ethernet driver"
+	tristate
 	select ADK_KERNEL_USB_USBNET
+	depends on ADK_TARGET_WITH_USB
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 	help
+	  USB SMSC95XX ethernet driver
 
-menu "Ethernet card support"
-depends on ADK_TARGET_WITH_PCI
+config ADK_KERNEL_SMC91X
+	prompt "SMC91X ethernet driver"
+	tristate
+	select ADK_KERNEL_NET_VENDOR_SMSC
+	default y if ADK_TARGET_SYSTEM_ARM_FM
+	default y if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
+	default y if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
+	default n
+	help
+ 	  SMC91X ethernet driver
+
+config ADK_KERNEL_VIA_RHINE
+	prompt "VIA Rhine ethernet driver"
+	tristate
+	select ADK_KERNEL_NET_VENDOR_VIA
+	select ADK_KERNEL_VIA_RHINE_MMIO
+	default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532
+	default n
+	help
+	  VIA Rhine ethernet driver
+
+config ADK_KERNEL_XILINX_AXI_EMAC
+	prompt "Xilinx AXI ethernet driver"
+	tristate
+	select ADK_KERNEL_NET_VENDOR_XILINX
+	default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
+	default n
+	help
+	  Xilinx AXI ethernet driver
 
-config ADK_KPACKAGE_KMOD_NE2K_PCI
-	prompt "kmod-net-ne2k-pci............. NE2000 PCI driver"
+config ADK_KERNEL_XILINX_EMACLITE
+	prompt "Xilinx Emaclite ethernet driver"
+	tristate
+	select ADK_KERNEL_NET_VENDOR_XILINX
+	default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
+	default n
+	help
+	  Xilinx Emaclite ethernet driver
+
+config ADK_KERNEL_NE2K_PCI
+	prompt "NE2000 PCI driver"
 	tristate
-	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_VENDOR_NATSEMI
 	select ADK_KERNEL_NET_VENDOR_8390
 	select ADK_KERNEL_MII
+	depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU
+	default y if ADK_TARGET_SYSTEM_QEMU_PPC
 	default n
 	help
-	  NE2000 pci driver
+	  NE2000 PCI driver
 
-config ADK_KPACKAGE_KMOD_PCNET32
-	prompt "kmod-net-pcnet32.............. AMD PCNet32 PCI driver"
+config ADK_KERNEL_PCNET32
+	prompt "AMD PCNet32 PCI driver"
 	tristate
-	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
+	depends on ADK_TARGET_WITH_PCI
 	default n
 	help
 	  AMD PCnet32 driver
 
-config ADK_KPACKAGE_KMOD_8139CP
-	prompt "kmod-net-rtl8139cp............ RTL8139C+ PCI driver"
+config ADK_KERNEL_8139CP
+	prompt "RTL8139C+ PCI driver"
 	tristate
-	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_VENDOR_REALTEK
 	select ADK_KERNEL_MII
+	depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
 	default n
 	help
 	  RTL8139C+ pci driver
 
-config ADK_KPACKAGE_KMOD_8139TOO
-	prompt "kmod-net-rtl8139.............. RTL8139 PCI driver"
+config ADK_KERNEL_8139TOO
+	prompt "RTL8139 PCI driver"
 	tristate
-	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
+	depends on ADK_TARGET_WITH_PCI
+	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 	help
 	  RTL8139 pci driver
 
-config ADK_KPACKAGE_KMOD_E100
-	prompt "kmod-net-e100................. Intel(R) PRO/100+ driver"
+config ADK_KERNEL_E100
+	prompt "Intel(R) PRO/100+ driver"
 	tristate
+	select ADK_KERNEL_NET_VENDOR_INTEL
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
+	depends on ADK_TARGET_WITH_PCI
 	default n
 	help
 	  Intel(R) PRO/100+ cards kernel support
 
-config ADK_KPACKAGE_KMOD_E1000
-	prompt "kmod-net-e1000................ Intel(R) PRO/1000 Gigabit Ethernet driver"
+config ADK_KERNEL_E1000
+	prompt "Intel(R) PRO/1000 Gigabit Ethernet driver"
 	tristate
-	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_NET_VENDOR_INTEL
 	select ADK_KERNEL_NETDEV_1000
+	depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU
+	default y if ADK_TARGET_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_QEMU_I486
+	default y if ADK_TARGET_SYSTEM_QEMU_I686
+	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64EL
+	default n
+	help
+	  Intel(R) PRO/1000 gigabit ethernet driver
+
+config ADK_KERNEL_SUNLANCE
+	prompt "AMD Sunlance Ethernet driver"
+	tristate
+	select ADK_KERNEL_NET_VENDOR_AMD
+	depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU
+	default y if ADK_TARGET_SYSTEM_QEMU_SPARC
 	default n
 	help
-	  This driver supports Intel(R) PRO/1000 gigabit ethernet family of
-	  adapters.  For more information on how to identify your adapter, go 
-	  to the Adapter & Driver ID Guide at:
+	  AMD Sunlance ethernet driver
 
-	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+config ADK_KERNEL_IBMVETH
+	prompt "IBM Ethernet driver"
+	tristate
+	select ADK_KERNEL_NET_VENDOR_IBM
+	depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU
+	default y if ADK_TARGET_SYSTEM_QEMU_PPC64
+	default n
+	help
+	  IBM ethernet driver
 
-config ADK_KPACKAGE_KMOD_SKY2
-	prompt "kmod-net-sky2................. Marvell Yukon driver"
+config ADK_KERNEL_SKY2
+	prompt "Marvell Yukon SKY2 driver"
 	tristate
-	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KERNEL_NET_VENDOR_MARVELL
+	depends on ADK_TARGET_WITH_PCI
 	default n
 	help
 
-config ADK_KPACKAGE_KMOD_R8169
-	prompt "kmod-net-r8169................ RTL8169 driver"
+config ADK_KERNEL_R8169
+	prompt "RTL8169 driver"
 	tristate
-	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KERNEL_MII
-	select ADK_KPACKAGE_KMOD_FW_LOADER
+	select ADK_KERNEL_FW_LOADER
+	depends on ADK_TARGET_WITH_PCI
 	default n
 	help
 
 endmenu
-endmenu