mk: fix dpaax library dependency
Checks
Commit Message
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>
---
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(-)
Comments
On 10/31/19 8:14 AM, Gagandeep Singh wrote:
> 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>
> ---
>
> 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
>
Acked-by: Thierry Herbelot <thierry.herbelot@6wind.com>
On 10/31/2019 9:50 AM, Thierry Herbelot wrote:
> On 10/31/19 8:14 AM, Gagandeep Singh wrote:
>> 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>
Applied to dpdk-next-net/master, thanks.
@@ -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',
@@ -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