X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fmeson.build;h=589f7863ae2d8a973b48d958eb9482a524082181;hb=f30e69b41f949cd4a9afb6ff39de196e661708e2;hp=0de2e17fe740256d6ac4d7e89586b7f001f73e95;hpb=e8a5e886d3565fdae386b32cba88b45f0c4ac4b9;p=dpdk.git

diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build
index 0de2e17fe7..589f7863ae 100644
--- a/drivers/net/sfc/meson.build
+++ b/drivers/net/sfc/meson.build
@@ -1,17 +1,16 @@
 # 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'
+if arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')
 	build = false
+	reason = 'only supported on x86_64'
 endif
 
-allow_experimental_apis = true
-
 extra_flags = []
 
 # Strict-aliasing rules are violated by rte_eth_link to uint64_t casts
@@ -19,14 +18,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 +33,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',
@@ -54,7 +50,8 @@ sources = files(
 	'sfc_flow.c',
 	'sfc_dp.c',
 	'sfc_ef10_rx.c',
-	'sfc_ef10_tx.c'
+	'sfc_ef10_essb_rx.c',
+	'sfc_ef10_tx.c',
+	'sfc_ef100_rx.c',
+	'sfc_ef100_tx.c',
 )
-
-includes += include_directories('base')