Not all flags were moved properly from the old Makefile build system.
Disable corresponding drivers and libnuma in cross files and remove
deprecated config.
Signed-off-by: Juraj Linkeš <juraj.lin...@pantheon.tech>
---
config/arm/arm64_armada_linux_gcc | 2 ++
config/arm/arm64_armv8_linux_gcc | 8 ++++++--
config/arm/arm64_bluefield_linux_gcc | 1 +
config/arm/arm64_dpaa_linux_gcc | 1 +
config/arm/arm64_n1sdp_linux_gcc | 1 +
config/arm/arm64_octeontx2_linux_gcc | 1 +
config/arm/arm64_stingray_linux_gcc | 1 +
config/arm/meson.build | 5 ++++-
drivers/meson.build | 4 ++++
9 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/config/arm/arm64_armada_linux_gcc
b/config/arm/arm64_armada_linux_gcc
index 36100c594..e33f1e742 100644
--- a/config/arm/arm64_armada_linux_gcc
+++ b/config/arm/arm64_armada_linux_gcc
@@ -17,3 +17,5 @@ endian = 'little'
implementer_id = '0x56'
max_numa_nodes = 1
max_lcores = 16
+has_libnuma = 0
+disabled_drivers = ['bus/dpaa', 'bus/fslmc', 'common/dpaax']
diff --git a/config/arm/arm64_armv8_linux_gcc b/config/arm/arm64_armv8_linux_gcc
index 779333199..c6010e303 100644
--- a/config/arm/arm64_armv8_linux_gcc
+++ b/config/arm/arm64_armv8_linux_gcc
@@ -28,7 +28,11 @@ implementer_id = 'generic'
part_number = 'generic'
# Supported extra configuration
-# max_numa_nodes = n # will set RTE_MAX_NUMA_NODES
-# max_lcores = n # will set RTE_MAX_LCORE
+# max_numa_nodes = n # will set RTE_MAX_NUMA_NODES
+# max_lcores = n # will set RTE_MAX_LCORE
max_lcores = 256
max_numa_nodes = 4
+
+# has_libnuma = 0 # set to 0 if the SoC is not a NUMA system
+# disabled_drivers += ['bus/dpaa', 'crypto']
+ # add to the set of disabled libraries
diff --git a/config/arm/arm64_bluefield_linux_gcc
b/config/arm/arm64_bluefield_linux_gcc
index 7ff6fd309..e154ac4fd 100644
--- a/config/arm/arm64_bluefield_linux_gcc
+++ b/config/arm/arm64_bluefield_linux_gcc
@@ -17,3 +17,4 @@ implementer_id = '0x41'
part_number = '0xd08'
max_numa_nodes = 1
max_lcores = 16
+has_libnuma = 0
diff --git a/config/arm/arm64_dpaa_linux_gcc b/config/arm/arm64_dpaa_linux_gcc
index adae86f57..78883a2ec 100644
--- a/config/arm/arm64_dpaa_linux_gcc
+++ b/config/arm/arm64_dpaa_linux_gcc
@@ -17,3 +17,4 @@ endian = 'little'
implementer_id = 'dpaa'
max_numa_nodes = 1
max_lcores = 16
+has_libnuma = 0
diff --git a/config/arm/arm64_n1sdp_linux_gcc b/config/arm/arm64_n1sdp_linux_gcc
index 3a8b46812..4493227f3 100644
--- a/config/arm/arm64_n1sdp_linux_gcc
+++ b/config/arm/arm64_n1sdp_linux_gcc
@@ -17,3 +17,4 @@ implementer_id = '0x41'
part_number = '0xd0c'
max_numa_nodes = 1
max_lcores = 4
+has_libnuma = 0
diff --git a/config/arm/arm64_octeontx2_linux_gcc
b/config/arm/arm64_octeontx2_linux_gcc
index 2baf95a2a..ff9e5c403 100644
--- a/config/arm/arm64_octeontx2_linux_gcc
+++ b/config/arm/arm64_octeontx2_linux_gcc
@@ -17,3 +17,4 @@ implementer_id = '0x43'
part_number = '0xb2'
max_numa_nodes = 1
max_lcores = 36
+has_libnuma = 0
diff --git a/config/arm/arm64_stingray_linux_gcc
b/config/arm/arm64_stingray_linux_gcc
index 7ff6fd309..e154ac4fd 100644
--- a/config/arm/arm64_stingray_linux_gcc
+++ b/config/arm/arm64_stingray_linux_gcc
@@ -17,3 +17,4 @@ implementer_id = '0x41'
part_number = '0xd08'
max_numa_nodes = 1
max_lcores = 16
+has_libnuma = 0
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 21deb2dd9..a023abb17 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -101,7 +101,6 @@ flags_octeontx2_extra = [
['RTE_MACHINE', '"octeontx2"'],
['RTE_ARM_FEATURE_ATOMICS', true],
['RTE_USE_C11_MEM_MODEL', true],
- ['RTE_EAL_IGB_UIO', false],
['RTE_MAX_LCORE', 36],
['RTE_MAX_NUMA_NODES', 1]
]
@@ -236,6 +235,10 @@ else
['RTE_MAX_LCORE', cross_max_lcores]
]
endif
+ cross_has_libnuma = meson.get_cross_property('has_libnuma', '')
+ if cross_has_libnuma != ''
+ has_libnuma = cross_has_libnuma
+ endif
endif
# apply supported machine args
diff --git a/drivers/meson.build b/drivers/meson.build
index 4c4866866..a997387ad 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -21,6 +21,10 @@ subdirs = [
disabled_drivers += run_command(list_dir_globs, get_option('disable_drivers'),
).stdout().split()
+if meson.is_cross_build()
+ disabled_drivers += meson.get_cross_property('disabled_drivers', [])
+endif
+
default_cflags = machine_args
default_cflags += ['-DALLOW_EXPERIMENTAL_API']
default_cflags += ['-DALLOW_INTERNAL_API']
--
2.20.1
