Commit 8920d75c authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Tomasz Zawadzki
Browse files

dpdkbuild: add defaults for CONFIG_RTE_* 



This serves as cleanup. Dont build anything by default,
enable stuff if needed. Enabling a library twice doesn't
cause any issues, so drop the piece of logic preventing that.

Change-Id: Ia1877635b100f73b27d9c63ed8baed8184729f1c
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1012


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 4fe25e72

dpdkbuild/Makefile

+12 −18
Original line number Diff line number Diff line
@@ -39,12 +39,22 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk 
DPDK_FRAMEWORK = n

DPDK_OPTS =

DPDK_CFLAGS =

DPDK_OPTS += CONFIG_RTE_BUILD_SHARED_LIB=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_REORDER=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_ETHER=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_CMDLINE=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_METER=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_HASH=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_VHOST=n

DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_ISAL=n



ifeq ($(CONFIG_SHARED),y)

DPDK_OPTS += CONFIG_RTE_BUILD_SHARED_LIB=y

DPDK_LDFLAGS+= -rpath $(SPDK_ROOT_DIR)/dpdk/build/lib

else

DPDK_OPTS += CONFIG_RTE_BUILD_SHARED_LIB=n

endif



ifeq ($(CONFIG_CRYPTO),y)
@@ -53,9 +63,6 @@ DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y 
DPDK_OPTS += CONFIG_RTE_LIBRTE_REORDER=y

DPDK_CFLAGS += -I$(IPSEC_MB_DIR)

DPDK_LDFLAGS += -L$(IPSEC_MB_DIR)

else

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_REORDER=n

endif



ifeq ($(CONFIG_REDUCE),y)
@@ -63,8 +70,6 @@ DPDK_FRAMEWORK = y 
DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_ISAL=y

DPDK_CFLAGS += -I$(ISAL_DIR)

DPDK_LDFLAGS += -L$(ISAL_DIR)/.libs

else

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_ISAL=n

endif



ifeq ($(CONFIG_VHOST),y)
@@ -73,26 +78,15 @@ DPDK_OPTS += CONFIG_RTE_LIBRTE_CMDLINE=y 
DPDK_OPTS += CONFIG_RTE_LIBRTE_METER=y

DPDK_OPTS += CONFIG_RTE_LIBRTE_HASH=y

DPDK_OPTS += CONFIG_RTE_LIBRTE_VHOST=y

else

DPDK_OPTS += CONFIG_RTE_LIBRTE_ETHER=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_CMDLINE=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_METER=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_HASH=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_VHOST=n

endif



ifeq ($(CONFIG_IGB_UIO_DRIVER),y)

DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=y

else

DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=n

endif



ifeq ($(DPDK_FRAMEWORK),y)

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=y

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y

else

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=n

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n

endif



ifeq ($(TARGET_MACHINE),aarch64)