diff options
| -rw-r--r-- | build-data/packages/dpdk.mk | 5 | ||||
| -rw-r--r-- | build-data/packages/vpp.mk | 3 | ||||
| -rw-r--r-- | build-data/platforms/vpp.mk | 1 | ||||
| -rw-r--r-- | dpdk/Makefile | 5 |
4 files changed, 13 insertions, 1 deletions
diff --git a/build-data/packages/dpdk.mk b/build-data/packages/dpdk.mk index 92eb6315eae..ab2e39a804e 100644 --- a/build-data/packages/dpdk.mk +++ b/build-data/packages/dpdk.mk @@ -27,6 +27,11 @@ ifneq ($(DPDK_MLX5_PMD),) DPDK_MAKE_ARGS += DPDK_MLX5_PMD=y endif +DPDK_MLX4_PMD=$(strip $($(PLATFORM)_uses_dpdk_mlx4_pmd)) +ifneq ($(DPDK_MLX4_PMD),) +DPDK_MAKE_ARGS += DPDK_MLX4_PMD=y +endif + DPDK_PLATFORM_TARGET=$(strip $($(PLATFORM)_dpdk_target)) ifneq ($(DPDK_PLATFORM_TARGET),) DPDK_MAKE_ARGS += DPDK_TARGET=$(DPDK_PLATFORM_TARGET) diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index 412259110de..19e32efdc24 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -39,6 +39,9 @@ endif ifeq ($($(PLATFORM)_uses_dpdk_mlx5_pmd),yes) vpp_configure_args += --with-dpdk-mlx5-pmd endif +ifeq ($($(PLATFORM)_uses_dpdk_mlx4_pmd),yes) +vpp_configure_args += --with-dpdk-mlx4-pmd +endif else vpp_configure_args += --disable-dpdk-plugin endif diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index 57501819c7e..ad15d7e272e 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -29,6 +29,7 @@ vpp_uses_dpdk = yes vpp_root_packages = vpp vom # DPDK configuration parameters +# vpp_uses_dpdk_mlx4_pmd = yes # vpp_uses_dpdk_mlx5_pmd = yes # vpp_uses_external_dpdk = yes # vpp_dpdk_inc_dir = /usr/include/dpdk diff --git a/dpdk/Makefile b/dpdk/Makefile index 799d9c4cb1f..ebe62bb5a23 100644 --- a/dpdk/Makefile +++ b/dpdk/Makefile @@ -22,6 +22,8 @@ DPDK_DOWNLOAD_DIR ?= $(HOME)/Downloads DPDK_DEBUG ?= n DPDK_MLX4_PMD ?= n DPDK_MLX5_PMD ?= n +DPDK_TAP_PMD ?= n +DPDK_FAILSAFE_PMD ?= n B := $(DPDK_BUILD_DIR) I := $(DPDK_INSTALL_DIR) @@ -199,8 +201,9 @@ $(B)/custom-config: $(B)/.patch.ok Makefile $(call set,RTE_LIBRTE_MLX5_PMD,$(DPDK_MLX5_PMD)) $(call set,RTE_LIBRTE_MLX4_DLOPEN_DEPS,$(DPDK_MLX4_PMD)) $(call set,RTE_LIBRTE_MLX5_DLOPEN_DEPS,$(DPDK_MLX5_PMD)) + $(call set,RTE_LIBRTE_PMD_TAP,$(DPDK_TAP_PMD)) + $(call set,RTE_LIBRTE_PMD_FAILSAFE,$(DPDK_FAILSAFE_PMD)) @# not needed - $(call set,RTE_LIBRTE_PMD_TAP,n) $(call set,RTE_LIBRTE_TIMER,n) $(call set,RTE_LIBRTE_CFGFILE,n) $(call set,RTE_LIBRTE_LPM,n) |