From patchwork Thu Oct 31 07:14:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 62275 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F35E2A00BE; Thu, 31 Oct 2019 08:30:26 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BB8471C1EC; Thu, 31 Oct 2019 08:30:26 +0100 (CET) Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by dpdk.org (Postfix) with ESMTP id 0176D1C112 for ; Thu, 31 Oct 2019 08:30:25 +0100 (CET) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 68C1D2007B7; Thu, 31 Oct 2019 08:30:25 +0100 (CET) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id DAC462002D3; Thu, 31 Oct 2019 08:30:22 +0100 (CET) Received: from GDB1.ap.freescale.net (gdb1.ap.freescale.net [10.232.132.179]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 983E6402A2; Thu, 31 Oct 2019 15:30:18 +0800 (SGT) From: Gagandeep Singh To: dev@dpdk.org, ferruh.yigit@intel.com Cc: thierry.herbelot@6wind.com, thomas@monjalon.net, Gagandeep Singh Date: Thu, 31 Oct 2019 12:44:10 +0530 Message-Id: <20191031071410.22632-1-g.singh@nxp.com> X-Mailer: git-send-email 2.17.1 X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH] mk: fix dpaax library dependency X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch fixes dpaax library dependency for NXP's PMDs. Fixes: e56463ec47f0 ('net/enetc: enable dpaax library') Fixes: 67fc3ff97c39 ('net/pfe: introduce basic functions') Fixes: 9e727d4a3fd4 ('crypto/caam_jr: integrate DPAAX table') Suggested-by: Thierry Herbelot Signed-off-by: Gagandeep Singh Acked-by: Thierry Herbelot Reviewed-by: Ferruh Yigit --- The first suggested patch was https://patchwork.dpdk.org/patch/62150/ , which is not the right fix for this issue. This patch is a complete fix of compilation issues because of NXP's PMDs. drivers/net/pfe/meson.build | 2 +- mk/rte.app.mk | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/pfe/meson.build b/drivers/net/pfe/meson.build index 799500b0a..678ce49a9 100644 --- a/drivers/net/pfe/meson.build +++ b/drivers/net/pfe/meson.build @@ -4,7 +4,7 @@ if host_machine.system() != 'linux' build = false endif -deps += ['bus_dpaa'] +deps += ['common_dpaax'] sources = files('pfe_ethdev.c', 'pfe_hal.c', diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 1f5c74841..4416caca7 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -126,11 +126,13 @@ ifneq (,$(findstring y,$(MVEP-y))) _LDLIBS-y += -lrte_common_mvep -L$(LIBMUSDK_PATH)/lib -lmusdk endif -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_COMMON_DPAAX) += -lrte_common_dpaax -endif -ifeq ($(CONFIG_RTE_LIBRTE_FSLMC_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_COMMON_DPAAX) += -lrte_common_dpaax +DPAAX-y := $(CONFIG_RTE_LIBRTE_DPAA_BUS) +DPAAX-y += $(CONFIG_RTE_LIBRTE_FSLMC_BUS) +DPAAX-y += $(CONFIG_RTE_LIBRTE_ENETC_PMD) +DPAAX-y += $(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) +DPAAX-y += $(CONFIG_RTE_LIBRTE_PFE_PMD) +ifeq ($(findstring y,$(DPAAX-y)),y) + _LDLIBS-y += -lrte_common_dpaax endif _LDLIBS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += -lrte_bus_pci