From 2cf0cf3f6f64ff13c43974e0ca2518938bc9c4f9 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 27 Aug 2015 18:15:13 +0800 Subject: meta-isg: dpdk: move patch from inc to bb Move the inclusion of patch: dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch from dpdk.inc to version specific dpdk bb files where it needs to be applied. This patch doesn't apply cleanly on top of dpdk v2.1. Signed-off-by: Anuj Mittal Signed-off-by: Saul Wold --- meta-isg/common/recipes-extended/dpdk/dpdk.inc | 1 - meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb | 2 ++ meta-isg/common/recipes-extended/dpdk/dpdk_2.0.0.bb | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'meta-isg/common/recipes-extended/dpdk') diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc index 1bd2a26e..929397d7 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc +++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc @@ -4,7 +4,6 @@ LICENSE = "BSD & LGPLv2 & GPLv2" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ - file://dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch \ file://dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ file://dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch \ file://dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch \ diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb b/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb index b1a3aea5..a6b2aed6 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb +++ b/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb @@ -1,5 +1,7 @@ include dpdk.inc +SRC_URI += "file://dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch" + SRC_URI[dpdk.md5sum] = "11ad8785aaa869cc87265bcb8d828f22" SRC_URI[dpdk.sha256sum] = "9f5386830bd999355182e20408f3fc2cfa0802a4497fdded8d43202feede1939" diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk_2.0.0.bb b/meta-isg/common/recipes-extended/dpdk/dpdk_2.0.0.bb index cb1b1d3f..33ebaac4 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk_2.0.0.bb +++ b/meta-isg/common/recipes-extended/dpdk/dpdk_2.0.0.bb @@ -1,7 +1,8 @@ include dpdk.inc SRC_URI += "file://dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch \ - " + file://dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch \ + " SRC_URI[dpdk.md5sum] = "e9e7935c9eec920841ad373949514934" SRC_URI[dpdk.sha256sum] = "643789a3be5ba44dd84d6b248cdf5471b260f8736dada177dadf076aebfbff3f" -- cgit v1.2.3-54-g00ecf From 7559504bf2186f78c2775998ff4fd15f3cc9010b Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 27 Aug 2015 18:15:14 +0800 Subject: meta-isg: dpdk: intel-corei7-64 as COMPATIBLE_MACHINE Add intel-corei7-64 as a compatible machine in addition to crystalforest. This is in line with the move to intel common BSP for all supported platforms. Signed-off-by: Anuj Mittal Signed-off-by: Saul Wold --- meta-isg/common/recipes-extended/dpdk/dpdk.inc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta-isg/common/recipes-extended/dpdk') diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc index 929397d7..da481fce 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc +++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc @@ -9,6 +9,8 @@ SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ file://dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch \ " +COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" + # dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat. # fuse is in meta-filesystems and qat is not yet upstreamed. # So adding mechanism to explicitly disable the use of fuse and qat. @@ -53,6 +55,7 @@ def get_dpdk_target_mach(bb, d): "crystalforest": "ivb", "romley": "snd", "romley-ivb": "ivb", + "intel_corei7_64": "hsw", } if target_arch in multiarch_options : -- cgit v1.2.3-54-g00ecf From 4c0f5f8975671e83df5b243e71ef92654ac344c8 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 27 Aug 2015 18:15:15 +0800 Subject: meta-isg: enable dpdk v2.1.0 for grantley This adds the recipe for dpdk v2.1.0 for grantley platforms based on common intel-corei7-64 BSP. Signed-off-by: Anuj Mittal Signed-off-by: Saul Wold --- ...onfig-variable-to-enable-disable-dpdk_qat.patch | 31 ++++++++++++++++++++++ .../common/recipes-extended/dpdk/dpdk_2.1.0.bb | 16 +++++++++++ 2 files changed, 47 insertions(+) create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.1.0-add-config-variable-to-enable-disable-dpdk_qat.patch create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk_2.1.0.bb (limited to 'meta-isg/common/recipes-extended/dpdk') diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.1.0-add-config-variable-to-enable-disable-dpdk_qat.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.1.0-add-config-variable-to-enable-disable-dpdk_qat.patch new file mode 100644 index 00000000..cd517052 --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.1.0-add-config-variable-to-enable-disable-dpdk_qat.patch @@ -0,0 +1,31 @@ +From a424a79b1422f1877de3ee7aee6f781aeacc3630 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +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 +--- + 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/meta-isg/common/recipes-extended/dpdk/dpdk_2.1.0.bb b/meta-isg/common/recipes-extended/dpdk/dpdk_2.1.0.bb new file mode 100644 index 00000000..7a7af6fe --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk_2.1.0.bb @@ -0,0 +1,16 @@ +include dpdk.inc + +SRC_URI += "\ + file://dpdk-2.1.0-add-config-variable-to-enable-disable-dpdk_qat.patch \ + file://dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch \ + " + +SRC_URI[dpdk.md5sum] = "205a0d12bfd6eb717d57506272f43519" +SRC_URI[dpdk.sha256sum] = "f7b322867a45f99afd9c8fbacdc56e1621676f9ca0f046656ec85eb6a99a3440" + +export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" +export ARCHDIR = "generic" + +do_configure_prepend () { + sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/common_linuxapp +} -- cgit v1.2.3-54-g00ecf