IPv6 ND Router discovery data plane (VPP-1095)

[vpp.git] / dpdk / Makefile

diff --git a/dpdk/Makefile b/dpdk/Makefile
index 844d641..40c7b9a 100644 (file)
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -17,6 +17,7 @@ SHELL := /bin/bash
 DPDK_BUILD_DIR        ?= $(CURDIR)/_build
 DPDK_INSTALL_DIR      ?= $(CURDIR)/_install
 DPDK_PKTMBUF_HEADROOM ?= 128
+DPDK_CACHE_LINE_SIZE  ?= 64
 DPDK_DOWNLOAD_DIR     ?= $(HOME)/Downloads
 DPDK_DEBUG            ?= n
 DPDK_MLX4_PMD         ?= n
@@ -24,7 +25,7 @@ DPDK_MLX5_PMD         ?= n
 
 B := $(DPDK_BUILD_DIR)
 I := $(DPDK_INSTALL_DIR)
-DPDK_VERSION ?= 17.11
+DPDK_VERSION ?= 18.02
 PKG_SUFFIX ?= vpp1
 DPDK_BASE_URL ?= http://fast.dpdk.org/rel
 DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.xz
@@ -177,6 +178,7 @@ $(B)/custom-config: $(B)/.patch.ok Makefile
        @# modify options
        $(call set,RTE_MAX_LCORE,256)
        $(call set,RTE_PKTMBUF_HEADROOM,$(DPDK_PKTMBUF_HEADROOM))
+       $(call set,RTE_CACHE_LINE_SIZE,$(DPDK_CACHE_LINE_SIZE))
        $(call set,RTE_LIBEAL_USE_HPET,y)
        $(call set,RTE_BUILD_COMBINE_LIBS,y)
        $(call set,RTE_PCI_CONFIG,y)
@@ -195,6 +197,8 @@ $(B)/custom-config: $(B)/.patch.ok Makefile
        $(call set,RTE_LIBRTE_PMD_AESNI_GCM,$(AESNI))
        $(call set,RTE_LIBRTE_MLX4_PMD,$(DPDK_MLX4_PMD))
        $(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))
        @# not needed
        $(call set,RTE_LIBRTE_PMD_TAP,n)
        $(call set,RTE_LIBRTE_TIMER,n)
@@ -209,6 +213,12 @@ $(B)/custom-config: $(B)/.patch.ok Makefile
        $(call set,RTE_LIBRTE_FLOW_CLASSIFY,n)
        $(call set,RTE_KNI_KMOD,n)
        $(call set,RTE_EAL_IGB_UIO,n)
+       @# currently broken in 18.02
+       $(call set,RTE_LIBRTE_DPAA_BUS,n)
+       $(call set,RTE_LIBRTE_DPAA_MEMPOOL,n)
+       $(call set,RTE_LIBRTE_DPAA_PMD,n)
+       $(call set,RTE_LIBRTE_PMD_DPAA_SEC,n)
+       $(call set,RTE_LIBRTE_PMD_DPAA_EVENTDEV,n)
        @rm -f .config.ok
 
 $(CURDIR)/$(DPDK_TARBALL):
@@ -290,7 +300,7 @@ build-ipsec-mb:
        mkdir -p $(I)/lib/
        # Do not build GCM stuff if we are building ISA_L
        make -C $(AESNIMB_LIB_SOURCE) -j \
-         DEBUG=$(DPDK_DEBUG) EXTRA_CFLAGS=-fPIC NASM=$(NASM_SOURCE)/nasm
+         EXTRA_CFLAGS=-fPIC NASM=$(NASM_SOURCE)/nasm
        cp $(AESNIMB_LIB_SOURCE)/libIPSec_MB.a $(I)/lib/
 
 .PHONY: build-dpdk