fm10k: move to drivers/net/

move fm10k PMD to drivers/net directory Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: John McNamara <john.mcnamara@intel.com> Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
2015-05-15 16:56:51 +01:00 · 2015-05-15 16:56:51 +01:00 · 637bb7694d
commit 637bb7694d
parent 72f3de308f
24 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -232,7 +232,7 @@ F: doc/guides/nics/intel_vf.rst

 Intel fm10k
 M: Jing Chen <jing.d.chen@intel.com>
-F: lib/librte_pmd_fm10k/
+F: drivers/net/fm10k/

 Mellanox mlx4
 M: Adrien Mazarguil <adrien.mazarguil@6wind.com>
--- a/doc/guides/prog_guide/source_org.rst
+++ b/doc/guides/prog_guide/source_org.rst
@ -79,7 +79,6 @@ The lib directory contains::
    +-- librte_mempool      # memory pool manager (fixedsized objects)
    +-- librte_meter        # QoS metering library
    +-- librte_net          # various IP-related headers
-    +-- librte_pmd_fm10k    # Host interface PMD driver for FM10000 Series
    +-- librte_pmd_ixgbe    # 10GbE poll mode driver
    +-- librte_pmd_i40e     # 40GbE poll mode driver
    +-- librte_pmd_mlx4     # Mellanox ConnectX-3 poll mode driver
@ -108,6 +107,7 @@ The drivers directory has a net subdirectory which contains::
    +-- bonding            # bonding poll mode driver
    +-- e1000              # 1GbE poll mode drivers (igb and em)
    +-- enic               # Cisco VIC Ethernet NIC Poll-mode Driver
+    +-- fm10k              # Host interface PMD driver for FM10000 Series

 Applications
 ------------
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@ -35,6 +35,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += af_packet
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bonding
 DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000
 DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic
+DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k

 include $(RTE_SDK)/mk/rte.sharelib.mk
 include $(RTE_SDK)/mk/rte.subdir.mk
--- a/lib/librte_pmd_fm10k/Makefile
+++ b/lib/librte_pmd_fm10k/Makefile
--- a/lib/librte_pmd_fm10k/base/fm10k_api.c
+++ b/lib/librte_pmd_fm10k/base/fm10k_api.c
--- a/lib/librte_pmd_fm10k/base/fm10k_api.h
+++ b/lib/librte_pmd_fm10k/base/fm10k_api.h
--- a/lib/librte_pmd_fm10k/base/fm10k_common.c
+++ b/lib/librte_pmd_fm10k/base/fm10k_common.c
--- a/lib/librte_pmd_fm10k/base/fm10k_common.h
+++ b/lib/librte_pmd_fm10k/base/fm10k_common.h
--- a/lib/librte_pmd_fm10k/base/fm10k_mbx.c
+++ b/lib/librte_pmd_fm10k/base/fm10k_mbx.c
--- a/lib/librte_pmd_fm10k/base/fm10k_mbx.h
+++ b/lib/librte_pmd_fm10k/base/fm10k_mbx.h
--- a/lib/librte_pmd_fm10k/base/fm10k_osdep.h
+++ b/lib/librte_pmd_fm10k/base/fm10k_osdep.h
--- a/lib/librte_pmd_fm10k/base/fm10k_pf.c
+++ b/lib/librte_pmd_fm10k/base/fm10k_pf.c
--- a/lib/librte_pmd_fm10k/base/fm10k_pf.h
+++ b/lib/librte_pmd_fm10k/base/fm10k_pf.h
--- a/lib/librte_pmd_fm10k/base/fm10k_tlv.c
+++ b/lib/librte_pmd_fm10k/base/fm10k_tlv.c
--- a/lib/librte_pmd_fm10k/base/fm10k_tlv.h
+++ b/lib/librte_pmd_fm10k/base/fm10k_tlv.h
--- a/lib/librte_pmd_fm10k/base/fm10k_type.h
+++ b/lib/librte_pmd_fm10k/base/fm10k_type.h
--- a/lib/librte_pmd_fm10k/base/fm10k_vf.c
+++ b/lib/librte_pmd_fm10k/base/fm10k_vf.c
--- a/lib/librte_pmd_fm10k/base/fm10k_vf.h
+++ b/lib/librte_pmd_fm10k/base/fm10k_vf.h
--- a/lib/librte_pmd_fm10k/fm10k.h
+++ b/lib/librte_pmd_fm10k/fm10k.h
--- a/lib/librte_pmd_fm10k/fm10k_ethdev.c
+++ b/lib/librte_pmd_fm10k/fm10k_ethdev.c
--- a/lib/librte_pmd_fm10k/fm10k_logs.h
+++ b/lib/librte_pmd_fm10k/fm10k_logs.h
--- a/lib/librte_pmd_fm10k/fm10k_rxtx.c
+++ b/lib/librte_pmd_fm10k/fm10k_rxtx.c
--- a/lib/librte_pmd_fm10k/rte_pmd_fm10k_version.map
+++ b/lib/librte_pmd_fm10k/rte_pmd_fm10k_version.map
--- a/lib/Makefile
+++ b/lib/Makefile
@ -43,7 +43,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline
 DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ether
 DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += librte_pmd_ixgbe
 DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += librte_pmd_i40e
-DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += librte_pmd_fm10k
 DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += librte_pmd_mlx4
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += librte_pmd_ring
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += librte_pmd_pcap