X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fmeson.build;h=c3ecdbe19711c15fb44d77614786b8fc33dfb76d;hb=0f2b55a401f68912d25ce3fdd68b84b1fdb31dbf;hp=e67560991a0fe4335087bf0ad99ed2b35a2da24b;hpb=d23e141ffa52e3ae13a5fd1c1cfb88f40cbd06f3;p=dpdk.git

diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build
index e67560991a..c3ecdbe197 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-2020 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' or not dpdk_conf.get('RTE_ARCH_64')
+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,14 +24,12 @@ extra_flags += '-Wno-strict-aliasing'
 
 # Enable more warnings
 extra_flags += [
-	'-Wextra',
 	'-Wdisabled-optimization'
 ]
 
 # Compiler and version dependent flags
 extra_flags += [
 	'-Waggregate-return',
-	'-Wnested-externs',
 	'-Wbad-function-cast'
 ]
 
@@ -36,14 +39,13 @@ foreach flag: extra_flags
 	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_sriov.c',
 	'sfc_intr.c',
 	'sfc_ev.c',
 	'sfc_port.c',
@@ -51,11 +53,13 @@ sources = files(
 	'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_ef10_tx.c',
+	'sfc_ef100_rx.c',
+	'sfc_ef100_tx.c',
 )
-
-includes += include_directories('base')