From: Pavan Nikhilesh <pbhagavat...@marvell.com> Since AARCH32 extension is not implemented on octeontx2 family, only enable build for 64bit. Due to Linux kernel AF(Admin Function) driver dependency, only enable build for 64-bit Linux.
Signed-off-by: Pavan Nikhilesh <pbhagavat...@marvell.com> Acked-by: Jerin Jacob <jer...@marvell.com> --- drivers/common/octeontx2/meson.build | 10 ++-------- drivers/event/octeontx2/meson.build | 4 ++-- drivers/mempool/octeontx2/meson.build | 9 ++------- drivers/net/octeontx2/meson.build | 10 ++-------- drivers/raw/octeontx2_dma/meson.build | 10 ++++++---- 5 files changed, 14 insertions(+), 29 deletions(-) diff --git a/drivers/common/octeontx2/meson.build b/drivers/common/octeontx2/meson.build index dcfaa1e102..223ba5ef51 100644 --- a/drivers/common/octeontx2/meson.build +++ b/drivers/common/octeontx2/meson.build @@ -2,15 +2,9 @@ # Copyright(C) 2019 Marvell International Ltd. # -if is_windows +if not is_linux or not dpdk_conf.get('RTE_ARCH_64') build = false - reason = 'not supported on Windows' - subdir_done() -endif - -if not dpdk_conf.get('RTE_ARCH_64') - build = false - reason = 'only supported on 64-bit' + reason = 'only supported on 64-bit Linux' subdir_done() endif diff --git a/drivers/event/octeontx2/meson.build b/drivers/event/octeontx2/meson.build index 96ebb1f2e7..ce360af5f8 100644 --- a/drivers/event/octeontx2/meson.build +++ b/drivers/event/octeontx2/meson.build @@ -2,9 +2,9 @@ # Copyright(C) 2019 Marvell International Ltd. # -if not dpdk_conf.get('RTE_ARCH_64') +if not is_linux or not dpdk_conf.get('RTE_ARCH_64') build = false - reason = 'only supported on 64-bit' + reason = 'only supported on 64-bit Linux' subdir_done() endif diff --git a/drivers/mempool/octeontx2/meson.build b/drivers/mempool/octeontx2/meson.build index 2a1dfddd4c..a4bea6d364 100644 --- a/drivers/mempool/octeontx2/meson.build +++ b/drivers/mempool/octeontx2/meson.build @@ -2,14 +2,9 @@ # Copyright(C) 2019 Marvell International Ltd. # -if is_windows +if not is_linux or not dpdk_conf.get('RTE_ARCH_64') build = false - reason = 'not supported on Windows' - subdir_done() -endif -if not dpdk_conf.get('RTE_ARCH_64') - build = false - reason = 'only supported on 64-bit' + reason = 'only supported on 64-bit Linux' subdir_done() endif diff --git a/drivers/net/octeontx2/meson.build b/drivers/net/octeontx2/meson.build index a355313120..ab15844cbc 100644 --- a/drivers/net/octeontx2/meson.build +++ b/drivers/net/octeontx2/meson.build @@ -2,15 +2,9 @@ # Copyright(C) 2019 Marvell International Ltd. # -if is_windows +if not is_linux or not dpdk_conf.get('RTE_ARCH_64') build = false - reason = 'not supported on Windows' - subdir_done() -endif - -if not dpdk_conf.get('RTE_ARCH_64') - build = false - reason = 'only supported on 64-bit' + reason = 'only supported on 64-bit Linux' subdir_done() endif diff --git a/drivers/raw/octeontx2_dma/meson.build b/drivers/raw/octeontx2_dma/meson.build index e744fccaae..6460bd8242 100644 --- a/drivers/raw/octeontx2_dma/meson.build +++ b/drivers/raw/octeontx2_dma/meson.build @@ -2,14 +2,16 @@ # Copyright(C) 2019 Marvell International Ltd. # +if not is_linux or not dpdk_conf.get('RTE_ARCH_64') + build = false + reason = 'only supported on 64-bit Linux' + subdir_done() +endif + deps += ['bus_pci', 'common_octeontx2', 'rawdev'] sources = files('otx2_dpi_rawdev.c', 'otx2_dpi_msg.c', 'otx2_dpi_test.c') extra_flags = [] -# This integrated controller runs only on a arm64 machine, remove 32bit warnings -if not dpdk_conf.get('RTE_ARCH_64') - extra_flags += ['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast'] -endif foreach flag: extra_flags if cc.has_argument(flag) -- 2.17.1