Commit 8aaec569 authored by paul luse's avatar paul luse Committed by Darek Stojaczyk
Browse files

dpdk-sub: move submodule and stop building cryptodev API in makefile 



Addresses issues with building both compressDev and cryptoDev at the
same time that we will run into shortly.  We now build both API all
the time but those things that have ext deps are still built only
when their respective configure options are set.

Change-Id: Ia4b1d4f18826a8d78c2f09881fb268a8aff61f56
Signed-off-by: default avatarpaul luse <paul.e.luse@intel.com>
Reviewed-on: https://review.gerrithub.io/437989


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 1c3f9982

dpdk @ f112e7ba

Compare a8ba8524 to f112e7ba
Original line number Diff line number Diff line 
Subproject commit a8ba8524ac5581b424dedd46c599eeeb27a90073
 
Subproject commit f112e7bacd0f2a1e4f030674e3e009473f3f0c5d

dpdkbuild/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ ifeq ($(CONFIG_CRYPTO),y) 
ifeq ($(TARGET_MACHINE),x86_64)

CRYPTO_ENABLED = y

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y

DPDK_OPTS += CONFIG_RTE_LIBRTE_CRYPTODEV=y

DPDK_OPTS += CONFIG_RTE_LIBRTE_REORDER=y

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=y

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y
@@ -59,7 +58,6 @@ endif 
ifeq ($(CRYPTO_ENABLED),n)

DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_CRYPTODEV=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_REORDER=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n

lib/env_dpdk/env.mk

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ endif 


ifeq ($(CONFIG_CRYPTO),y)

DPDK_LIB_LIST += rte_cryptodev rte_reorder rte_bus_vdev rte_pmd_aesni_mb rte_pmd_qat rte_mbuf

# crypto doesn't need this lib but because of DPDK API and PMD deps, we have to include it here

# or the qat PMD won't build because we always build the compressdev API

DPDK_LIB_LIST += rte_compressdev

endif



ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_kvargs.*))