dpdk: upgrade to version 17.05

Signed-off-by: Syed Mohamad Fauzi, Syed Johan Arif <syed.johan.arif.syed.mohamad.fauzi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

5 files changed, 6 insertions, 82 deletions

diff --git a/common/recipes-extended/dpdk/dpdk.inc b/common/recipes-extended/dpdk/dpdk.inc
index bfb30341..642aade3 100644
--- a/common/recipes-extended/dpdk/dpdk.inc
+++ b/common/recipes-extended/dpdk/dpdk.inc
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe"
 SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \
            file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
            file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \
-           file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \
            file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \
            file://dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch \
            file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
@@ -61,7 +60,7 @@ def get_dpdk_target_mach(bb, d):
         "mohonpeak64":    "atm",
         "mohonpeak32":    "atm",
         "crystalforest":  "ivb",
-        "intel_corei7_64": "hsw",
+        "intel_corei7_64": "atm",
     }
 
     if target_arch in multiarch_options :
diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-config-variable-to-enable-disable-dpdk_qat.patch b/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-config-variable-to-enable-disable-dpdk_qat.patch
deleted file mode 100644
index cd517052..00000000
--- a/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-config-variable-to-enable-disable-dpdk_qat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a424a79b1422f1877de3ee7aee6f781aeacc3630 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anujx.mittal@intel.com>
-Date: Tue, 18 Aug 2015 12:36:02 +0800
-Subject: [PATCH] examples: add config variable to enable/disable dpdk_qat
-
-Upstream-Status: Inappropriate [configuration]
-
-Add CONFIG_EXAMPLE_DPDK_QAT to control compilation of dpdk_qat
-example by PACKAGECONFIG
-
-Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
----
- examples/Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/Makefile b/examples/Makefile
-index b4eddbd..1bc14b0 100644
---- a/examples/Makefile
-+++ b/examples/Makefile
-@@ -41,7 +41,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond
- DIRS-y += cmdline
- DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor
- ifneq ($(ICP_ROOT),)
--DIRS-y += dpdk_qat
-+DIRS-$(CONFIG_EXAMPLE_DPDK_QAT) += dpdk_qat
- endif
- DIRS-y += exception_path
- DIRS-y += helloworld
--- 
-1.7.9.5
-
diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-16.04-point-to-the-right-include-and-lib-path.patch b/common/recipes-extended/dpdk/dpdk/dpdk-16.04-point-to-the-right-include-and-lib-path.patch
deleted file mode 100644
index 75bb517d..00000000
--- a/common/recipes-extended/dpdk/dpdk/dpdk-16.04-point-to-the-right-include-and-lib-path.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 928595c80ae28d19861d7e76ed898a8fb3f2c1dc Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anujx.mittal@intel.com>
-Date: Fri, 24 Jul 2015 23:57:17 +0800
-Subject: [PATCH] dpdk: point to the right include and lib path
-
-Upstream-Status: Inappropriate [Configuration]
-
-Make sure that we point to the right location of qat
-lac headers and library.
-
-Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
----
- examples/dpdk_qat/Makefile |    7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/examples/dpdk_qat/Makefile b/examples/dpdk_qat/Makefile
-index f1e06a1..5b906f7 100644
---- a/examples/dpdk_qat/Makefile
-+++ b/examples/dpdk_qat/Makefile
-@@ -66,18 +66,15 @@ SRCS-y := main.c crypto.c
- 
- CFLAGS += -O3
- CFLAGS += $(WERROR_FLAGS)
--CFLAGS += -I$(ICP_ROOT)/quickassist/include \
--               -I$(ICP_ROOT)/quickassist/include/lac \
--               -I$(ICP_ROOT)/quickassist/lookaside/access_layer/include
-+CFLAGS += -I$(ICP_LAC_API_DIR)
- 
- # From CRF 1.2 driver, library was renamed to libicp_qa_al.a
- ifneq ($(wildcard $(ICP_ROOT)/build/icp_qa_al.a),)
- ICP_LIBRARY_PATH = $(ICP_ROOT)/build/icp_qa_al.a
- else
--ICP_LIBRARY_PATH = $(ICP_ROOT)/build/libicp_qa_al.a
-+ICP_LIBRARY_PATH = $(ICP_LIB_ROOT)/libicp_qa_al.a
- endif
- 
--LDLIBS += -L$(ICP_ROOT)/build
- LDLIBS += $(ICP_LIBRARY_PATH) \
-                 -lz \
-                 -losal \
--- 
-1.7.9.5
-
diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch b/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch
index e17d80d1..fc965fa4 100644
--- a/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch
+++ b/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch
@@ -18,9 +18,9 @@ index 18b41b9..c7c2beb 100644
 --- a/examples/Makefile
 +++ b/examples/Makefile
 @@ -43,6 +43,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor
- ifneq ($(ICP_ROOT),)
- DIRS-y += dpdk_qat
- endif
+ DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond
+ DIRS-y += cmdline
+ DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor
 +DEPDIRS-y += examples/ethtool/lib
  DIRS-y += ethtool
  DIRS-y += exception_path
diff --git a/common/recipes-extended/dpdk/dpdk_17.02.bb b/common/recipes-extended/dpdk/dpdk_17.05.bb
index ed549694..9c23fadd 100644
--- a/common/recipes-extended/dpdk/dpdk_17.02.bb
+++ b/common/recipes-extended/dpdk/dpdk_17.05.bb
@@ -1,12 +1,11 @@
 include dpdk.inc
 
 SRC_URI += "\
-            file://dpdk-16.04-add-config-variable-to-enable-disable-dpdk_qat.patch \
             file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \
             "
 
-SRC_URI[dpdk.md5sum] = "9ac25cffecbf550e145c45e53db03a3d"
-SRC_URI[dpdk.sha256sum] = "b07b546e910095174bdb6152bb0d7ce057cc4b79aaa74771aeee4e8a7219fb38"
+SRC_URI[dpdk.md5sum] = "39c4e1110dd1ef9dab33edbae820f939"
+SRC_URI[dpdk.sha256sum] = "763bfb7e1765efcc949e79d645dc9f1ebd16591431ba0db5ce22becd928dcd0a"
 
 export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
 export ARCHDIR = "generic"