X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fmeson.build;h=ccf5984d87fb8b7c2fc16166989d65acdc93c476;hb=c995b00572f88792b8257e59ad5abe82cd95e8dd;hp=a37fc44a76c99cbcd3b5f8ccbac9fd75d2138a7f;hpb=f16d0b36f8168a4c8ec71af178be558008008b98;p=dpdk.git

diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build
index a37fc44a76..ccf5984d87 100644
--- a/drivers/net/sfc/meson.build
+++ b/drivers/net/sfc/meson.build
@@ -1,16 +1,21 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
-# Copyright (c) 2016-2018 Solarflare Communications Inc.
-# All rights reserved.
+# Copyright(c) 2019-2021 Xilinx, Inc.
+# Copyright(c) 2016-2019 Solarflare Communications Inc.
 #
 # This software was jointly developed between OKTET Labs (under contract
 # for Solarflare) and Solarflare Communications, Inc.
 
-if arch_subdir != 'x86'
-	build = false
+if is_windows
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
-allow_experimental_apis = true
+if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
+    build = false
+    reason = 'only supported on x86_64 and aarch64'
+endif
 
 extra_flags = []
 
@@ -19,46 +24,42 @@ extra_flags += '-Wno-strict-aliasing'
 
 # Enable more warnings
 extra_flags += [
-	'-Wextra',
-	'-Wdisabled-optimization'
+        '-Wdisabled-optimization',
 ]
 
 # Compiler and version dependent flags
 extra_flags += [
-	'-Waggregate-return',
-	'-Wnested-externs',
-	'-Wbad-function-cast'
+        '-Waggregate-return',
+        '-Wbad-function-cast',
 ]
 
-# Suppress ICC false positive warning on 'bulk' may be used before its
-# value is set
-extra_flags += '-diag-disable 3656'
-
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
-subdir('base')
-objs = [base_objs]
-
+deps += ['common_sfc_efx', 'bus_pci']
 sources = files(
-	'sfc_ethdev.c',
-	'sfc_kvargs.c',
-	'sfc.c',
-	'sfc_mcdi.c',
-	'sfc_intr.c',
-	'sfc_ev.c',
-	'sfc_port.c',
-	'sfc_rx.c',
-	'sfc_tx.c',
-	'sfc_tso.c',
-	'sfc_filter.c',
-	'sfc_flow.c',
-	'sfc_dp.c',
-	'sfc_ef10_rx.c',
-	'sfc_ef10_tx.c'
+        'sfc_ethdev.c',
+        'sfc_kvargs.c',
+        'sfc.c',
+        'sfc_mcdi.c',
+        'sfc_sriov.c',
+        'sfc_intr.c',
+        'sfc_ev.c',
+        'sfc_port.c',
+        'sfc_rx.c',
+        'sfc_tx.c',
+        'sfc_tso.c',
+        'sfc_filter.c',
+        'sfc_switch.c',
+        'sfc_mae.c',
+        'sfc_flow.c',
+        'sfc_dp.c',
+        'sfc_ef10_rx.c',
+        'sfc_ef10_essb_rx.c',
+        'sfc_ef10_tx.c',
+        'sfc_ef100_rx.c',
+        'sfc_ef100_tx.c',
 )
-
-includes += include_directories('base')