From c86d9b355f376a8600a21d247d159e864a301053 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Thu, 31 Oct 2019 12:44:10 +0530 Subject: [PATCH] mk: fix dpaax library dependency 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 --- 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 799500b0a7..678ce49a9d 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 059fe5d1d5..683e3a4e33 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -128,11 +128,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 -- 2.20.1