Fix Cavium Liquidio build related errors and warnings

[deliverable/linux.git] / drivers / net / ethernet / cavium / Kconfig

diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig
index fc3d8e3ee807d439647202a5b086eca67ecadebc..5e7a0e270d547d5ebac9c176f48fc4d1c7e09cf2 100644 (file)
--- a/drivers/net/ethernet/cavium/Kconfig
+++ b/drivers/net/ethernet/cavium/Kconfig
@@ -4,37 +4,54 @@
 
 config NET_VENDOR_CAVIUM
        tristate "Cavium ethernet drivers"
-       depends on PCI && 64BIT
+       depends on PCI
+       default y
        ---help---
-         Enable support for the Cavium ThunderX Network Interface
-         Controller (NIC). The NIC provides the controller and DMA
-         engines to move network traffic to/from the memory. The NIC
-         works closely with TNS, BGX and SerDes to implement the
-         functions replacing and virtualizing those of a typical
-         standalone PCIe NIC chip.
+         Select this option if you want enable Cavium network support.
 
-         If you have a Cavium Thunder board, say Y.
+         If you have a Cavium SoC or network adapter, say Y.
 
 if NET_VENDOR_CAVIUM
 
 config THUNDER_NIC_PF
        tristate "Thunder Physical function driver"
-       default NET_VENDOR_CAVIUM
+       depends on 64BIT
+       default ARCH_THUNDER
        select THUNDER_NIC_BGX
        ---help---
          This driver supports Thunder's NIC physical function.
+         The NIC provides the controller and DMA engines to
+         move network traffic to/from the memory. The NIC
+         works closely with TNS, BGX and SerDes to implement the
+         functions replacing and virtualizing those of a typical
+         standalone PCIe NIC chip.
 
 config THUNDER_NIC_VF
        tristate "Thunder Virtual function driver"
-       default NET_VENDOR_CAVIUM
+       depends on 64BIT
+       default ARCH_THUNDER
        ---help---
          This driver supports Thunder's NIC virtual function
 
 config THUNDER_NIC_BGX
        tristate "Thunder MAC interface driver (BGX)"
-       default NET_VENDOR_CAVIUM
+       depends on 64BIT
+       default ARCH_THUNDER
        ---help---
          This driver supports programming and controlling of MAC
          interface from NIC physical function driver.
 
+config LIQUIDIO
+       tristate "Cavium LiquidIO support"
+       depends on 64BIT
+       select PTP_1588_CLOCK
+       select FW_LOADER
+       select LIBCRC32
+       ---help---
+         This driver supports Cavium LiquidIO Intelligent Server Adapters
+         based on CN66XX and CN68XX chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called liquidio.  This is recommended.
+
 endif # NET_VENDOR_CAVIUM