d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drivers: clean up build lists

Browse Source 
Ensure all lists of drivers are standardized:
* one driver per line
* lists double-indented with spaces (as they are line continuations)
* elements in alphabetical order
* opening and closing list brackets "[" & "]" on own lines
* last element has trailing comma

Any code snippets in the list files is adjusted to single-indent using
whitespace to correspond to the new style also.

The lists of standard library dependencies per class, and other short
lists are not formatted one-per-line as these lists are not expected to
grow beyond 2 or 3 entries.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Bruce Richardson 2021-04-20 11:22:20 +01:00 committed by Thomas Monjalon
parent 6f8a1a4591
commit cf995efc53
12 changed files with 171 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/baseband/meson.build
View File

@ -2,7 +2,13 @@
# Copyright(c) 2018 Luca Boccassi <bluca@debian.org> # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
if is_windows if is_windows
subdir_done() subdir_done()
endif endif
drivers = ['null', 'turbo_sw', 'fpga_lte_fec', 'fpga_5gnr_fec', 'acc100'] drivers = [
'acc100',
'fpga_5gnr_fec',
'fpga_lte_fec',
'null',
'turbo_sw',
]

9
drivers/bus/meson.build
View File

@ -1,5 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation # Copyright(c) 2017 Intel Corporation
drivers = ['dpaa', 'fslmc', 'ifpga', 'pci', 'vdev', 'vmbus'] drivers = [
'dpaa',
'fslmc',
'ifpga',
'pci',
'vdev',
'vmbus',
]
std_deps = ['eal'] std_deps = ['eal']

9
drivers/common/meson.build
View File

@ -2,4 +2,11 @@
# Copyright(c) 2018 Cavium, Inc # Copyright(c) 2018 Cavium, Inc
std_deps = ['eal'] std_deps = ['eal']
drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2'] drivers = [
'cpt',
'dpaax',
'iavf',
'mvep',
'octeontx',
'octeontx2',
]

9
drivers/compress/meson.build
View File

@ -2,9 +2,14 @@
# Copyright(c) 2018 Intel Corporation # Copyright(c) 2018 Intel Corporation
if is_windows if is_windows
subdir_done() subdir_done()
endif endif
drivers = ['isal', 'mlx5', 'octeontx', 'zlib'] drivers = [
'isal',
'mlx5',
'octeontx',
'zlib',
]
std_deps = ['compressdev'] # compressdev pulls in all other needed deps std_deps = ['compressdev'] # compressdev pulls in all other needed deps

42
drivers/crypto/meson.build
View File

@ -2,27 +2,29 @@
# Copyright(c) 2017 Intel Corporation # Copyright(c) 2017 Intel Corporation
if is_windows if is_windows
subdir_done() subdir_done()
endif endif
drivers = ['aesni_gcm', drivers = [
'aesni_mb', 'aesni_gcm',
'armv8', 'aesni_mb',
'bcmfs', 'armv8',
'caam_jr', 'bcmfs',
'ccp', 'caam_jr',
'dpaa_sec', 'ccp',
'dpaa2_sec', 'dpaa_sec',
'kasumi', 'dpaa2_sec',
'mvsam', 'kasumi',
'nitrox', 'mvsam',
'null', 'nitrox',
'octeontx', 'null',
'octeontx2', 'octeontx',
'openssl', 'octeontx2',
'scheduler', 'openssl',
'snow3g', 'scheduler',
'virtio', 'snow3g',
'zuc'] 'virtio',
'zuc',
]
std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps

18
drivers/event/meson.build
View File

@ -2,13 +2,21 @@
# Copyright(c) 2017 Intel Corporation # Copyright(c) 2017 Intel Corporation
if is_windows if is_windows
subdir_done() subdir_done()
endif endif
drivers = ['dlb2', 'dpaa', 'dpaa2', 'octeontx2', 'opdl', 'skeleton', 'sw', drivers = [
'dsw'] 'dlb2',
'dpaa',
'dpaa2',
'dsw',
'octeontx2',
'opdl',
'skeleton',
'sw',
]
if not (toolchain == 'gcc' and cc.version().version_compare('<4.8.6') and if not (toolchain == 'gcc' and cc.version().version_compare('<4.8.6') and
dpdk_conf.has('RTE_ARCH_ARM64')) dpdk_conf.has('RTE_ARCH_ARM64'))
drivers += 'octeontx' drivers += 'octeontx'
endif endif
std_deps = ['eventdev', 'kvargs'] std_deps = ['eventdev', 'kvargs']

12
drivers/mempool/meson.build
View File

@ -1,6 +1,14 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation # Copyright(c) 2017 Intel Corporation
drivers = ['bucket', 'cnxk', 'dpaa', 'dpaa2', 'octeontx', 'octeontx2', 'ring', drivers = [
'stack'] 'bucket',
'cnxk',
'dpaa',
'dpaa2',
'octeontx',
'octeontx2',
'ring',
'stack',
]
std_deps = ['mempool'] std_deps = ['mempool']

38
drivers/meson.build
View File

@ -3,26 +3,26 @@
# Defines the order of dependencies evaluation # Defines the order of dependencies evaluation
subdirs = [ subdirs = [
'common', 'common',
'bus', 'bus',
'common/cnxk', # depends on bus. 'common/cnxk', # depends on bus.
'common/mlx5', # depends on bus. 'common/mlx5', # depends on bus.
'common/qat', # depends on bus. 'common/qat', # depends on bus.
'common/sfc_efx', # depends on bus. 'common/sfc_efx', # depends on bus.
'mempool', # depends on common and bus. 'mempool', # depends on common and bus.
'net', # depends on common, bus, mempool 'net', # depends on common, bus, mempool
'raw', # depends on common, bus and net. 'raw', # depends on common, bus and net.
'crypto', # depends on common, bus and mempool (net in future). 'crypto', # depends on common, bus and mempool (net in future).
'compress', # depends on common, bus, mempool. 'compress', # depends on common, bus, mempool.
'regex', # depends on common, bus, regexdev. 'regex', # depends on common, bus, regexdev.
'vdpa', # depends on common, bus and mempool. 'vdpa', # depends on common, bus and mempool.
'event', # depends on common, bus, mempool and net. 'event', # depends on common, bus, mempool and net.
'baseband', # depends on common and bus. 'baseband', # depends on common and bus.
] ]
if meson.is_cross_build() if meson.is_cross_build()
disable_drivers += ',' + meson.get_cross_property('disable_drivers', '') disable_drivers += ',' + meson.get_cross_property('disable_drivers', '')
enable_drivers += ',' + meson.get_cross_property('enable_drivers', '') enable_drivers += ',' + meson.get_cross_property('enable_drivers', '')
endif endif
# add cmdline disabled drivers and meson disabled drivers together # add cmdline disabled drivers and meson disabled drivers together
@ -33,7 +33,7 @@ disable_drivers = run_command(list_dir_globs, disable_drivers).stdout().split()
enable_drivers = ',' + get_option('enable_drivers') enable_drivers = ',' + get_option('enable_drivers')
enable_drivers = run_command(list_dir_globs, enable_drivers).stdout().split() enable_drivers = run_command(list_dir_globs, enable_drivers).stdout().split()
if enable_drivers.length() == 0 if enable_drivers.length() == 0
enable_drivers = run_command(list_dir_globs, '*/*').stdout().split() enable_drivers = run_command(list_dir_globs, '*/*').stdout().split()
endif endif
# these drivers must always be enabled, otherwise the build breaks # these drivers must always be enabled, otherwise the build breaks
@ -45,7 +45,7 @@ default_cflags += ['-DALLOW_EXPERIMENTAL_API']
default_cflags += ['-DALLOW_INTERNAL_API'] default_cflags += ['-DALLOW_INTERNAL_API']
if cc.has_argument('-Wno-format-truncation') if cc.has_argument('-Wno-format-truncation')
default_cflags += '-Wno-format-truncation' default_cflags += '-Wno-format-truncation'
endif endif
foreach subpath:subdirs foreach subpath:subdirs

108
drivers/net/meson.build
View File

@ -2,58 +2,62 @@
# Copyright(c) 2017 Intel Corporation # Copyright(c) 2017 Intel Corporation
drivers = ['af_packet', drivers = [
'af_xdp', 'af_packet',
'ark', 'af_xdp',
'atlantic', 'ark',
'avp', 'atlantic',
'axgbe', 'bonding', 'avp',
'bnx2x', 'axgbe',
'bnxt', 'bnx2x',
'cxgbe', 'bnxt',
'dpaa', 'dpaa2', 'bonding',
'e1000', 'cxgbe',
'ena', 'dpaa',
'enetc', 'dpaa2',
'enic', 'e1000',
'failsafe', 'ena',
'fm10k', 'i40e', 'enetc',
'hinic', 'enic',
'hns3', 'failsafe',
'iavf', 'fm10k',
'ice', 'hinic',
'igc', 'hns3',
'ionic', 'i40e',
'ipn3ke', 'iavf',
'ixgbe', 'ice',
'kni', 'igc',
'liquidio', 'ionic',
'memif', 'ipn3ke',
'mlx4', 'ixgbe',
'mlx5', 'kni',
'mvneta', 'liquidio',
'mvpp2', 'memif',
'netvsc', 'mlx4',
'nfb', 'mlx5',
'nfp', 'mvneta',
'null', 'mvpp2',
'octeontx', 'netvsc',
'octeontx2', 'nfb',
'octeontx_ep', 'nfp',
'pcap', 'null',
'pfe', 'octeontx',
'qede', 'octeontx2',
'ring', 'octeontx_ep',
'sfc', 'pcap',
'softnic', 'pfe',
'szedata2', 'qede',
'tap', 'ring',
'thunderx', 'sfc',
'txgbe', 'softnic',
'vdev_netvsc', 'szedata2',
'vhost', 'tap',
'virtio', 'thunderx',
'vmxnet3', 'txgbe',
'vdev_netvsc',
'vhost',
'virtio',
'vmxnet3',
] ]
std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc 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_pci'] # very many PMDs depend on PCI, so make std

17
drivers/raw/meson.build
View File

@ -2,12 +2,17 @@
# Copyright 2018 NXP # Copyright 2018 NXP
if is_windows if is_windows
subdir_done() subdir_done()
endif endif
drivers = ['dpaa2_cmdif', 'dpaa2_qdma', drivers = [
'ifpga', 'ioat', 'ntb', 'dpaa2_cmdif',
'octeontx2_dma', 'dpaa2_qdma',
'octeontx2_ep', 'ifpga',
'skeleton'] 'ioat',
'ntb',
'octeontx2_dma',
'octeontx2_ep',
'skeleton',
]
std_deps = ['rawdev'] std_deps = ['rawdev']

5
drivers/regex/meson.build
View File

@ -1,5 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# Copyright 2020 Mellanox Technologies, Ltd # Copyright 2020 Mellanox Technologies, Ltd
drivers = ['mlx5', 'octeontx2'] drivers = [
'mlx5',
'octeontx2',
]
std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc

8
drivers/vdpa/meson.build
View File

@ -2,10 +2,12 @@
# Copyright 2019 Mellanox Technologies, Ltd # Copyright 2019 Mellanox Technologies, Ltd
if is_windows if is_windows
subdir_done() subdir_done()
endif endif
drivers = ['ifc', drivers = [
'mlx5',] 'ifc',
'mlx5',
]
std_deps = ['bus_pci', 'kvargs'] std_deps = ['bus_pci', 'kvargs']
std_deps += ['vhost'] std_deps += ['vhost']