From: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
To: jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com,
harry.van.haaren@intel.com
Cc: dev@dpdk.org, Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Subject: [dpdk-dev] [PATCH v4 2/4] drivers/net: add drivers for Cavium NICs to meson build
Date: Fri, 19 Jan 2018 23:45:19 +0530 [thread overview]
Message-ID: <20180119181521.21534-2-pbhagavatula@caviumnetworks.com> (raw)
In-Reply-To: <20180119181521.21534-1-pbhagavatula@caviumnetworks.com>
Add Cavium octeontx and thunder nicvf to meson build infrastructure.
Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
---
drivers/net/meson.build | 3 ++-
drivers/net/octeontx/base/meson.build | 21 +++++++++++++++++++++
drivers/net/octeontx/meson.build | 13 +++++++++++++
drivers/net/thunderx/Makefile | 2 +-
drivers/net/thunderx/base/meson.build | 15 +++++++++++++++
drivers/net/thunderx/meson.build | 20 ++++++++++++++++++++
...cvf_version.map => rte_pmd_thunderx_version.map} | 0
7 files changed, 72 insertions(+), 2 deletions(-)
create mode 100644 drivers/net/octeontx/base/meson.build
create mode 100644 drivers/net/octeontx/meson.build
create mode 100644 drivers/net/thunderx/base/meson.build
create mode 100644 drivers/net/thunderx/meson.build
rename drivers/net/thunderx/{rte_pmd_thunderx_nicvf_version.map => rte_pmd_thunderx_version.map} (100%)
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 72e1d3578..b132d3558 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -3,7 +3,8 @@
drivers = ['af_packet', 'bonding',
'e1000', 'fm10k', 'i40e', 'ixgbe',
- 'null', 'pcap', 'ring']
+ 'null', 'pcap', 'ring',
+ 'octeontx', 'thunderx']
std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std
std_deps += ['bus_vdev'] # same with vdev bus
diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build
new file mode 100644
index 000000000..09f657abb
--- /dev/null
+++ b/drivers/net/octeontx/base/meson.build
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Cavium, Inc
+
+sources = [
+ 'octeontx_pkovf.c',
+ 'octeontx_pkivf.c',
+ 'octeontx_bgx.c'
+]
+
+depends = ['ethdev', 'mempool_octeontx']
+static_objs = []
+foreach d: depends
+ static_objs += [get_variable('static_rte_' + d)]
+endforeach
+
+base_lib = static_library('octeontx_base', sources,
+ c_args: cflags,
+ dependencies: static_objs,
+)
+
+base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/octeontx/meson.build b/drivers/net/octeontx/meson.build
new file mode 100644
index 000000000..ef789eaa9
--- /dev/null
+++ b/drivers/net/octeontx/meson.build
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Cavium, Inc
+
+subdir('base')
+objs = [base_objs]
+
+sources = files('octeontx_rxtx.c',
+ 'octeontx_ethdev.c'
+ )
+
+deps += ['mempool_octeontx', 'eventdev']
+
+includes += include_directories('base')
diff --git a/drivers/net/thunderx/Makefile b/drivers/net/thunderx/Makefile
index cc008bd3a..e6bf49752 100644
--- a/drivers/net/thunderx/Makefile
+++ b/drivers/net/thunderx/Makefile
@@ -16,7 +16,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
LDLIBS += -lrte_bus_pci
-EXPORT_MAP := rte_pmd_thunderx_nicvf_version.map
+EXPORT_MAP := rte_pmd_thunderx_version.map
LIBABIVER := 1
diff --git a/drivers/net/thunderx/base/meson.build b/drivers/net/thunderx/base/meson.build
new file mode 100644
index 000000000..c9d5a8f4e
--- /dev/null
+++ b/drivers/net/thunderx/base/meson.build
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Cavium, Inc
+
+sources = [
+ 'nicvf_hw.c',
+ 'nicvf_mbox.c',
+ 'nicvf_bsvf.c'
+]
+
+base_lib = static_library('nicvf_base', sources,
+ c_args: cflags,
+ dependencies: static_rte_ethdev
+)
+
+base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/thunderx/meson.build b/drivers/net/thunderx/meson.build
new file mode 100644
index 000000000..69819a97f
--- /dev/null
+++ b/drivers/net/thunderx/meson.build
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Cavium, Inc
+
+subdir('base')
+objs = [base_objs]
+
+sources = files('nicvf_rxtx.c',
+ 'nicvf_ethdev.c',
+ 'nicvf_svf.c'
+)
+
+if cc.has_argument('-fno-prefetch-loop-arrays')
+ cflags += '-fno-prefetch-loop-arrays'
+endif
+
+if cc.has_argument('-Wno-maybe-uninitialized')
+ cflags += '-Wno-maybe-uninitialized'
+endif
+
+includes += include_directories('base')
diff --git a/drivers/net/thunderx/rte_pmd_thunderx_nicvf_version.map b/drivers/net/thunderx/rte_pmd_thunderx_version.map
similarity index 100%
rename from drivers/net/thunderx/rte_pmd_thunderx_nicvf_version.map
rename to drivers/net/thunderx/rte_pmd_thunderx_version.map
--
2.15.1
next prev parent reply other threads:[~2018-01-19 18:15 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-31 0:02 [dpdk-dev] [PATCH 1/4] drivers/mempool: add octeontx mempool driver " Pavan Nikhilesh
2017-12-31 0:02 ` [dpdk-dev] [PATCH 2/4] drivers/net: add drivers for Cavium NICs " Pavan Nikhilesh
2018-01-09 17:29 ` Bruce Richardson
2018-01-11 12:42 ` Pavan Nikhilesh
2017-12-31 0:02 ` [dpdk-dev] [PATCH 3/4] event/octeontx: add octeontx event device " Pavan Nikhilesh
2018-01-09 17:34 ` Bruce Richardson
2018-01-11 13:15 ` Pavan Nikhilesh
2017-12-31 0:02 ` [dpdk-dev] [PATCH 4/4] app/test-eventdev: add test-eventdev " Pavan Nikhilesh
2018-01-09 17:35 ` [dpdk-dev] [PATCH 1/4] drivers/mempool: add octeontx mempool driver " Bruce Richardson
2018-01-11 13:38 ` Pavan Nikhilesh
2018-01-11 13:44 ` Pavan Nikhilesh
2018-01-09 17:41 ` Bruce Richardson
2018-01-11 14:13 ` Pavan Nikhilesh
2018-01-14 13:28 ` [dpdk-dev] [PATCH v2 " Pavan Nikhilesh
2018-01-14 13:28 ` [dpdk-dev] [PATCH v2 2/4] drivers/net: add drivers for Cavium NICs " Pavan Nikhilesh
2018-01-14 13:28 ` [dpdk-dev] [PATCH v2 3/4] event/octeontx: add octeontx event device " Pavan Nikhilesh
2018-01-14 13:28 ` [dpdk-dev] [PATCH v2 4/4] app/test-eventdev: add test-eventdev " Pavan Nikhilesh
2018-01-19 13:12 ` [dpdk-dev] [PATCH v3 1/4] drivers/mempool: add octeontx mempool driver " Pavan Nikhilesh
2018-01-19 13:12 ` [dpdk-dev] [PATCH v3 2/4] drivers/net: add drivers for Cavium NICs " Pavan Nikhilesh
2018-01-19 17:16 ` Bruce Richardson
2018-01-19 17:29 ` Pavan Nikhilesh
2018-01-19 13:12 ` [dpdk-dev] [PATCH v3 3/4] event: add octeontx event device " Pavan Nikhilesh
2018-01-19 17:19 ` Bruce Richardson
2018-01-19 13:12 ` [dpdk-dev] [PATCH v3 4/4] app/test-eventdev: add test-eventdev " Pavan Nikhilesh
2018-01-19 17:26 ` Bruce Richardson
2018-01-19 16:48 ` [dpdk-dev] [PATCH v3 1/4] drivers/mempool: add octeontx mempool driver " Bruce Richardson
2018-01-19 18:15 ` [dpdk-dev] [PATCH v4 " Pavan Nikhilesh
2018-01-19 18:15 ` Pavan Nikhilesh [this message]
2018-01-22 14:35 ` [dpdk-dev] [PATCH v4 2/4] drivers/net: add drivers for Cavium NICs " Bruce Richardson
2018-01-19 18:15 ` [dpdk-dev] [PATCH v4 3/4] event: add octeontx event device " Pavan Nikhilesh
2018-01-19 18:15 ` [dpdk-dev] [PATCH v4 4/4] app/test-eventdev: add test-eventdev " Pavan Nikhilesh
2018-01-22 14:37 ` [dpdk-dev] [PATCH v4 1/4] drivers/mempool: add octeontx mempool driver " Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180119181521.21534-2-pbhagavatula@caviumnetworks.com \
--to=pbhagavatula@caviumnetworks.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=harry.van.haaren@intel.com \
--cc=jerin.jacob@caviumnetworks.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).