Fixed vxlan link status.

[vpp.git] / dpdk / Makefile

diff --git a/dpdk/Makefile b/dpdk/Makefile
index c33cf63..307faf0 100644 (file)
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -23,10 +23,11 @@ DPDK_DEBUG            ?= n
 
 B := $(DPDK_BUILD_DIR)
 I := $(DPDK_INSTALL_DIR)
-DPDK_VERSION := 2.1.0
+DPDK_VERSION ?= 2.2.0
 DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.gz
 DPDK_TAR_URL := http://dpdk.org/browse/dpdk/snapshot/$(DPDK_TARBALL)
-DPDK_TARBALL_MD5_CKSUM := 205a0d12bfd6eb717d57506272f43519
+DPDK_2.1.0_TARBALL_MD5_CKSUM := 205a0d12bfd6eb717d57506272f43519
+DPDK_2.2.0_TARBALL_MD5_CKSUM := 22e2fd68cd5504f43fe9a5a6fd6dd938
 DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION)
 DPDK_TARGET := x86_64-native-linuxapp-gcc
 JOBS := $(shell grep processor /proc/cpuinfo | wc -l)
@@ -88,6 +89,7 @@ $(B)/custom-config: $(B)/.patch.ok Makefile
        $(call set,RTE_TOOLCHAIN_GCC,y)
        $(call set,RTE_TOOLCHAIN,"gcc")
        @# modify options
+       $(call set,RTE_MAX_LCORE,256)
        $(call set,RTE_PKTMBUF_HEADROOM,$(DPDK_PKTMBUF_HEADROOM))
        $(call set,RTE_LIBEAL_USE_HPET,y)
        $(call set,RTE_BUILD_COMBINE_LIBS,y)
@@ -99,14 +101,14 @@ $(B)/custom-config: $(B)/.patch.ok Makefile
        $(call set,RTE_LIBRTE_E1000_DEBUG_INIT,$(DPDK_DEBUG))
        $(call set,RTE_LIBRTE_VIRTIO_DEBUG_INIT,$(DPDK_DEBUG))
        $(call set,RTE_LIBRTE_VMXNET3_DEBUG_INIT,$(DPDK_DEBUG))
+       $(call set,RTE_LIBRTE_PMD_BOND,y)
+       $(call set,RTE_LIBRTE_IP_FRAG,y)
        @# not needed
-       $(call set,RTE_LIBRTE_PMD_BOND,n)
        $(call set,RTE_LIBRTE_TIMER,n)
        $(call set,RTE_LIBRTE_CFGFILE,n)
        $(call set,RTE_LIBRTE_LPM,n)
        $(call set,RTE_LIBRTE_ACL,n)
        $(call set,RTE_LIBRTE_POWER,n)
-       $(call set,RTE_LIBRTE_IP_FRAG,n)
        $(call set,RTE_LIBRTE_DISTRIBUTOR,n)
        $(call set,RTE_LIBRTE_REORDER,n)
        $(call set,RTE_LIBRTE_PORT,n)
@@ -125,7 +127,7 @@ $(CURDIR)/$(DPDK_TARBALL):
 
 $(B)/.download.ok: $(CURDIR)/$(DPDK_TARBALL)
        @openssl md5 $< | cut -f 2 -d " " - > $(B)/$(DPDK_TARBALL).md5sum
-       @([ "$$(<$(B)/$(DPDK_TARBALL).md5sum)" = "$(DPDK_TARBALL_MD5_CKSUM)" ] || \
+       @([ "$$(<$(B)/$(DPDK_TARBALL).md5sum)" = "$(DPDK_$(DPDK_VERSION)_TARBALL_MD5_CKSUM)" ] || \
        ( echo "Bad Checksum! Please remove $< and retry" && \
                rm $(B)/$(DPDK_TARBALL).md5sum && false ))
        @touch $@