From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id A3190A04B7;
Tue, 13 Oct 2020 16:56:27 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id C10B51DD0E;
Tue, 13 Oct 2020 16:55:03 +0200 (CEST)
Received: from lb.pantheon.sk (lb.pantheon.sk [46.229.239.20])
by dpdk.org (Postfix) with ESMTP id A971B1DC59
for <dev@dpdk.org>; Tue, 13 Oct 2020 16:54:56 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
by lb.pantheon.sk (Postfix) with ESMTP id 52A49B6B43;
Tue, 13 Oct 2020 16:54:55 +0200 (CEST)
X-Virus-Scanned: amavisd-new at siecit.sk
Received: from lb.pantheon.sk ([127.0.0.1])
by localhost (lb.pantheon.sk [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id vXK_x8DhFcKQ; Tue, 13 Oct 2020 16:54:54 +0200 (CEST)
Received: from service-node1.lab.pantheon.local (unknown [46.229.239.141])
by lb.pantheon.sk (Postfix) with ESMTP id E6EA7B6B46;
Tue, 13 Oct 2020 16:54:48 +0200 (CEST)
From: =?UTF-8?q?Juraj=20Linke=C5=A1?= <juraj.linkes@pantheon.tech>
To: bruce.richardson@intel.com, Ruifeng.Wang@arm.com,
Honnappa.Nagarahalli@arm.com, Phil.Yang@arm.com, vcchunga@amazon.com,
Dharmik.Thakkar@arm.com, jerinjacobk@gmail.com, hemant.agrawal@nxp.com
Cc: dev@dpdk.org, =?UTF-8?q?Juraj=20Linke=C5=A1?= <juraj.linkes@pantheon.tech>
Date: Tue, 13 Oct 2020 16:54:41 +0200
Message-Id: <1602600882-695-6-git-send-email-juraj.linkes@pantheon.tech>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1602600882-695-1-git-send-email-juraj.linkes@pantheon.tech>
References: <1600867161-15673-1-git-send-email-juraj.linkes@pantheon.tech>
<1602600882-695-1-git-send-email-juraj.linkes@pantheon.tech>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [RFC PATCH v2 5/6] build: disable Arm drivers
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
A few options that disabled drivers in the old makefiles were improperly
ported to the meson build system. Fix this by adding a to the list of
disabled drivers, similarly how the command line option works.
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
---
config/arm/meson.build | 9 +++++----
drivers/meson.build | 2 +-
meson.build | 1 +
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index f525403f6..3a1e13f64 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -8,6 +8,11 @@
arm_force_native_march = false
native_machine_args = ['-march=native', '-mtune=native']
+# RFC: do we want these drivers to be disabled by default on arm?
+# The previous way to disable these drivers never worked
+# RTE_LIBRTE_AVP_PMD and the rest would be overwritten to true if the necessary deps were found
+disabled_drivers += ['net/avp', 'net/fm10k', 'net/sfc']
+
# common flags to all aarch64 builds, with lowest priority
flags_common_default = [
# Accelarate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest)
@@ -23,10 +28,6 @@ flags_common_default = [
# ['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF],
# ['RTE_ARM64_MEMCPY_STRICT_ALIGN', false],
- ['RTE_LIBRTE_FM10K_PMD', false],
- ['RTE_LIBRTE_SFC_EFX_PMD', false],
- ['RTE_LIBRTE_AVP_PMD', false],
-
['RTE_SCHED_VECTOR', false],
['RTE_ARM_USE_WFE', false],
['RTE_CACHE_LINE_SIZE', 128],
diff --git a/drivers/meson.build b/drivers/meson.build
index 5f9526557..f9250f3bb 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -17,7 +17,7 @@ subdirs = [
'baseband', # depends on common and bus.
]
-disabled_drivers = run_command(list_dir_globs, get_option('disable_drivers'),
+disabled_drivers += run_command(list_dir_globs, get_option('disable_drivers'),
).stdout().split()
default_cflags = machine_args
diff --git a/meson.build b/meson.build
index 61d9a4f5f..8dadd70dc 100644
--- a/meson.build
+++ b/meson.build
@@ -21,6 +21,7 @@ dpdk_drivers = []
dpdk_extra_ldflags = []
dpdk_libs_disabled = []
dpdk_drvs_disabled = []
+disabled_drivers = []
abi_version_file = files('ABI_VERSION')
if host_machine.cpu_family().startswith('x86')
--
2.20.1