net/cxgbe: define symbols only when not available

[dpdk.git] / config / arm / meson.build

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 94cca490ec086d689097872d67ec1c0fee1fa14e..dae55d6b268f7c67d0b56d97e810c21b987384dd 100644 (file)
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -46,6 +46,8 @@ flags_common_default = [
 
 flags_generic = [
        ['RTE_MACHINE', '"armv8a"'],
+       ['RTE_MAX_LCORE', 256],
+       ['RTE_USE_C11_MEM_MODEL', true],
        ['RTE_CACHE_LINE_SIZE', 128]]
 flags_cavium = [
        ['RTE_MACHINE', '"thunderx"'],
@@ -53,14 +55,16 @@ flags_cavium = [
        ['RTE_MAX_NUMA_NODES', 2],
        ['RTE_MAX_LCORE', 96],
        ['RTE_MAX_VFIO_GROUPS', 128],
-       ['RTE_RING_USE_C11_MEM_MODEL', false]]
+       ['RTE_USE_C11_MEM_MODEL', false]]
 flags_dpaa = [
        ['RTE_MACHINE', '"dpaa"'],
+       ['RTE_USE_C11_MEM_MODEL', true],
        ['RTE_CACHE_LINE_SIZE', 64],
        ['RTE_MAX_NUMA_NODES', 1],
        ['RTE_MAX_LCORE', 16]]
 flags_dpaa2 = [
        ['RTE_MACHINE', '"dpaa2"'],
+       ['RTE_USE_C11_MEM_MODEL', true],
        ['RTE_CACHE_LINE_SIZE', 64],
        ['RTE_MAX_NUMA_NODES', 1],
        ['RTE_MAX_LCORE', 16],
@@ -89,6 +93,9 @@ if cc.sizeof('void *') != 8
        dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
        dpdk_conf.set('RTE_ARCH_ARM', 1)
        dpdk_conf.set('RTE_ARCH_ARMv7', 1)
+       # the minimum architecture supported, armv7-a, needs the following,
+       # mk/machine/armv7a/rte.vars.mk sets it too
+       machine_args += '-mfpu=neon'
 else
        dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)
        dpdk_conf.set('RTE_ARCH_ARM64', 1)