From bd77f2d64c441d47d6254c31114838e8719043a9 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Fri, 19 Jan 2018 23:45:20 +0530 Subject: [PATCH] event/octeontx: build with meson Add Cavium octeontx to meson build and change order of drivers built from event->mempool->net to mempool->net->event to resolve dependency. Signed-off-by: Pavan Nikhilesh Acked-by: Bruce Richardson --- drivers/event/meson.build | 2 +- drivers/event/octeontx/Makefile | 2 +- drivers/event/octeontx/meson.build | 9 +++++++++ ...vf_version.map => rte_pmd_octeontx_event_version.map} | 0 drivers/meson.build | 7 ++++++- 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 drivers/event/octeontx/meson.build rename drivers/event/octeontx/{rte_pmd_octeontx_ssovf_version.map => rte_pmd_octeontx_event_version.map} (100%) diff --git a/drivers/event/meson.build b/drivers/event/meson.build index 437d80bfd4..d7bc48545a 100644 --- a/drivers/event/meson.build +++ b/drivers/event/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['skeleton', 'sw'] +drivers = ['skeleton', 'sw', 'octeontx'] std_deps = ['eventdev', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD' driver_name_fmt = 'rte_pmd_@0@_event' diff --git a/drivers/event/octeontx/Makefile b/drivers/event/octeontx/Makefile index 4b5fd25d48..0e49efd84e 100644 --- a/drivers/event/octeontx/Makefile +++ b/drivers/event/octeontx/Makefile @@ -17,7 +17,7 @@ LDLIBS += -lrte_eal -lrte_eventdev -lrte_mempool_octeontx -lrte_pmd_octeontx LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_mbuf -lrte_kvargs LDLIBS += -lrte_bus_vdev -EXPORT_MAP := rte_pmd_octeontx_ssovf_version.map +EXPORT_MAP := rte_pmd_octeontx_event_version.map LIBABIVER := 1 diff --git a/drivers/event/octeontx/meson.build b/drivers/event/octeontx/meson.build new file mode 100644 index 0000000000..358fc9fc90 --- /dev/null +++ b/drivers/event/octeontx/meson.build @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2017 Cavium, Inc + +sources = files('ssovf_worker.c', + 'ssovf_evdev.c', + 'ssovf_evdev_selftest.c' +) + +deps += ['mempool_octeontx', 'bus_vdev', 'pmd_octeontx'] diff --git a/drivers/event/octeontx/rte_pmd_octeontx_ssovf_version.map b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map similarity index 100% rename from drivers/event/octeontx/rte_pmd_octeontx_ssovf_version.map rename to drivers/event/octeontx/rte_pmd_octeontx_event_version.map diff --git a/drivers/meson.build b/drivers/meson.build index 5ee00264e6..a771b12e47 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -1,7 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -driver_classes = ['bus', 'crypto', 'event', 'mempool', 'net'] +# Defines the order in which the drivers are buit. +driver_classes = ['bus', + 'mempool', # depends on bus. + 'net', # depends on bus and mempool. + 'crypto', # depenss on bus, mempool (net in future). + 'event'] # depends on bus, mempool and net. foreach class:driver_classes drivers = [] -- 2.20.1