1 files changed, 54 insertions, 18 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 27732fdeeea4..54ab70e7eff4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1163,38 +1163,74 @@ config IBMVETH
           be called ibmveth.
 
 config IBM_EMAC
-        bool "IBM PPC4xx EMAC driver support"
+        tristate "PowerPC 4xx on-chip Ethernet support"
         depends on 4xx
-        select CRC32
-        ---help---
-          This driver supports the IBM PPC4xx EMAC family of on-chip
-          Ethernet controllers.
-
-config IBM_EMAC_ERRMSG
-        bool "Verbose error messages"
-        depends on IBM_EMAC && BROKEN
+        help
+          This driver supports the PowerPC 4xx EMAC family of on-chip
+          Ethernet controllers.
 
 config IBM_EMAC_RXB
         int "Number of receive buffers"
         depends on IBM_EMAC
-        default "128" if IBM_EMAC4
-        default "64"
+        default "128"
 
 config IBM_EMAC_TXB
         int "Number of transmit buffers"
         depends on IBM_EMAC
-        default "128" if IBM_EMAC4
-        default "8"
+        default "64"
+
+config IBM_EMAC_POLL_WEIGHT
+        int "MAL NAPI polling weight"
+        depends on IBM_EMAC
+        default "32"
 
-config IBM_EMAC_FGAP
-        int "Frame gap"
+config IBM_EMAC_RX_COPY_THRESHOLD
+        int "RX skb copy threshold (bytes)"
         depends on IBM_EMAC
-        default "8"
+        default "256"
 
-config IBM_EMAC_SKBRES
-        int "Skb reserve amount"
+config IBM_EMAC_RX_SKB_HEADROOM
+        int "Additional RX skb headroom (bytes)"
         depends on IBM_EMAC
         default "0"
+        help
+          Additional receive skb headroom. Note, that driver
+          will always reserve at least 2 bytes to make IP header
+          aligned, so usualy there is no need to add any additional
+          headroom.
+          
+          If unsure, set to 0.
+
+config IBM_EMAC_PHY_RX_CLK_FIX
+        bool "PHY Rx clock workaround"
+        depends on IBM_EMAC && (405EP || 440GX || 440EP)
+        help
+          Enable this if EMAC attached to a PHY which doesn't generate
+          RX clock if there is no link, if this is the case, you will 
+          see "TX disable timeout" or "RX disable timeout" in the system
+          log.
+          
+          If unsure, say N.
+
+config IBM_EMAC_DEBUG
+        bool "Debugging"
+        depends on IBM_EMAC
+        default n
+
+config IBM_EMAC_ZMII
+        bool
+        depends on IBM_EMAC && (NP405H || NP405L || 44x)
+        default y
+
+config IBM_EMAC_RGMII
+        bool
+        depends on IBM_EMAC && 440GX
+        default y
+                
+config IBM_EMAC_TAH
+        bool
+        depends on IBM_EMAC && 440GX
+        default y
 
 config NET_PCI
         bool "EISA, VLB, PCI and on board controllers"