FIB table add/delete API only

[vpp.git] / dpdk / Makefile

diff --git a/dpdk/Makefile b/dpdk/Makefile
index 659439c..2f5049e 100644 (file)
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -31,6 +31,7 @@ DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.xz
 DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
 DPDK_17.02_TARBALL_MD5_CKSUM := 6b9f7387c35641f4e8dbba3e528f2376
 DPDK_17.05_TARBALL_MD5_CKSUM := 0a68c31cd6a6cabeed0a4331073e4c05
+DPDK_17.08_TARBALL_MD5_CKSUM := 0641f59ea8ea98afefa7cfa2699f6241
 DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION)
 
 IPSEC_MB_VER := 0.45
@@ -53,6 +54,12 @@ endif
 
 MACHINE=$(shell uname -m)
 
+ifeq ($(MACHINE),$(filter $(MACHINE),x86_64))
+AESNI := y
+else
+AESNI := n
+endif
+
 ##############################################################################
 # Intel x86
 ##############################################################################
@@ -60,7 +67,6 @@ ifeq ($(MACHINE),$(filter $(MACHINE),x86_64 i686))
 DPDK_TARGET           ?= $(MACHINE)-native-linuxapp-$(DPDK_CC)
 DPDK_MACHINE          ?= nhm
 DPDK_TUNE             ?= core-avx2
-
 ##############################################################################
 # Cavium ThunderX
 ##############################################################################
@@ -139,8 +145,8 @@ $(B)/custom-config: $(B)/.patch.ok Makefile
        $(call set,RTE_LIBRTE_PMD_BOND,y)
        $(call set,RTE_LIBRTE_IP_FRAG,y)
        $(call set,RTE_LIBRTE_PMD_QAT,y)
-       $(call set,RTE_LIBRTE_PMD_AESNI_MB,y)
-       $(call set,RTE_LIBRTE_PMD_AESNI_GCM,y)
+       $(call set,RTE_LIBRTE_PMD_AESNI_MB,$(AESNI))
+       $(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))
        @# not needed
@@ -177,8 +183,10 @@ $(CURDIR)/$(ISA_L_CRYPTO_LIB_TARBALL):
        fi
 
 DPDK_DOWNLOADS = $(CURDIR)/$(DPDK_TARBALL)
+ifeq ($(AESNI),y)
 DPDK_DOWNLOADS += $(CURDIR)/$(AESNIMB_LIB_TARBALL)
 DPDK_DOWNLOADS += $(CURDIR)/$(ISA_L_CRYPTO_LIB_TARBALL)
+endif
 
 $(B)/.download.ok: $(DPDK_DOWNLOADS)
        @mkdir -p $(B)
@@ -236,7 +244,8 @@ build-ipsec-mb:
 build-isal-crypto:
        mkdir -p $(I)/lib/
        cd $(ISA_L_CRYPTO_LIB_SOURCE) && ./autogen.sh && \
-         ./configure --prefix=$(ISA_L_CRYPTO_INSTALL_DIR) CFLAGS='-fPIC -DPIC -O2'
+         ./configure --prefix=$(ISA_L_CRYPTO_INSTALL_DIR) \
+         --libdir=$(ISA_L_CRYPTO_INSTALL_DIR)/lib CFLAGS='-fPIC -DPIC -O2'
        make -C $(ISA_L_CRYPTO_LIB_SOURCE) -j install
        cp $(ISA_L_CRYPTO_INSTALL_DIR)/lib/libisal_crypto.a $(I)/lib/