build: add option to override max ethdev ports

Allow users and packagers to override the default RTE_MAX_ETHPORTS.
This adds a new meson option, max_ethports which defaults to the
current value.

Signed-off-by: Chas Williams <3chas3@gmail.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

diff --git a/config/meson.build b/config/meson.build
index c094c47558098a812d8652f38a59914bc6c17928..b91778e83a7f224e89f2a82cc267568808687131 100644 (file)
--- a/config/meson.build
+++ b/config/meson.build
@@ -105,6 +105,7 @@ endforeach
 # set other values pulled from the build options
 dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores'))
 dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
+dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
 dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
 dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id'))
 # values which have defaults which may be overridden

diff --git a/config/rte_config.h b/config/rte_config.h
index d3732e9533e4d027229640aa6300bbd6beeac4e4..7606f5d7b92c9ef0ef96b3de624dd9e7776635e4 100644 (file)
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -51,7 +51,6 @@
 #define RTE_PKTMBUF_HEADROOM 128
 
 /* ether defines */
-#define RTE_MAX_ETHPORTS 32
 #define RTE_MAX_QUEUES_PER_PORT 1024
 #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16
 #define RTE_ETHDEV_RXTX_CALLBACKS 1

diff --git a/meson_options.txt b/meson_options.txt
index 5740545975a4e31083c1042c87f864f118ed4fd1..71e39a48cc3319aed709f3bdc468535361ed0a50 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -18,6 +18,8 @@ option('lib_musdk_dir', type: 'string', value: '',
        description: 'path to the MUSDK library installation directory')
 option('machine', type: 'string', value: 'native',
        description: 'set the target machine type')
+option('max_ethports', type: 'string', value: '32',
+       description: 'maximum number of Ethernet devices')
 option('max_lcores', type: 'string', value: '128',
        description: 'maximum number of cores/threads supported by EAL')
 option('max_numa_nodes', type: 'string', value: '4',