mk: fix dpaax library dependency
authorGagandeep Singh <g.singh@nxp.com>
Thu, 31 Oct 2019 07:14:10 +0000 (12:44 +0530)
committerFerruh Yigit <ferruh.yigit@intel.com>
Fri, 8 Nov 2019 22:15:04 +0000 (23:15 +0100)
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 <thierry.herbelot@6wind.com>
Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
Acked-by: Thierry Herbelot <thierry.herbelot@6wind.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
drivers/net/pfe/meson.build
mk/rte.app.mk

index 799500b..678ce49 100644 (file)
@@ -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',
index 059fe5d..683e3a4 100644 (file)
@@ -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