diff options
author | WU CHIA CHUAN <chia.chuan.wu@intel.com> | 2015-07-28 16:05:08 +0800 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2015-07-29 13:06:55 -0700 |
commit | 0e009603a34380f84847803c815d029df486f890 (patch) | |
tree | 8362f370e905cd0368e3b78d670a9ddc6b8c4250 /meta-isg/common/recipes-extended/dpdk/dpdk | |
parent | 7c8a68e7a62185b4b6c94b061af65361084a92b8 (diff) | |
download | meta-intel-0e009603a34380f84847803c815d029df486f890.tar.gz |
meta-isg: dpdk: tidy up dpdk.inc & removed unnecessary patches
This patch tidy up dpdk.inc and removing unnecessary patches.
Integrating common recipe from dpdk_1.8.0.bb and dpdk_2.0.0.bb.
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: WU CHIA CHUAN <chia.chuan.wu@intel.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
(cherry picked from commit 76d81da78421b48cea47d7090855173f87a43a99)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'meta-isg/common/recipes-extended/dpdk/dpdk')
3 files changed, 0 insertions, 141 deletions
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-dpdk-defconfig-select-RTE_MACHINE-type.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-dpdk-defconfig-select-RTE_MACHINE-type.patch deleted file mode 100644 index 979541e9..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-dpdk-defconfig-select-RTE_MACHINE-type.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From 6eaf6b1a61321acb824f9672c12d0e30a2110f52 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ong Boon Leong <boon.leong.ong@intel.com> | ||
3 | Date: Mon, 16 Mar 2015 11:10:43 +0800 | ||
4 | Subject: [PATCH] DPDK: defconfig: add selectable RTE_MACHINE option | ||
5 | |||
6 | In order to make sure that DPDK build environment config can handle the | ||
7 | package being built on different build machine for different target machine | ||
8 | which will have different x86 architecture intrinsics than the build machine, | ||
9 | we introduce DPDK_TARGET_MACH to be tunable from dpdk recipe. The machine | ||
10 | type can be under mk/machine folder. | ||
11 | |||
12 | Upstream-Status: Inappropriate [configuration] | ||
13 | |||
14 | Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com> | ||
15 | --- | ||
16 | config/defconfig_i686-native-linuxapp-gcc | 2 +- | ||
17 | config/defconfig_x86_64-native-linuxapp-gcc | 2 +- | ||
18 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc | ||
21 | index a90de9b..c9a74a5 100644 | ||
22 | --- a/config/defconfig_i686-native-linuxapp-gcc | ||
23 | +++ b/config/defconfig_i686-native-linuxapp-gcc | ||
24 | @@ -32,7 +32,7 @@ | ||
25 | |||
26 | #include "common_linuxapp" | ||
27 | |||
28 | -CONFIG_RTE_MACHINE="native" | ||
29 | +CONFIG_RTE_MACHINE=$(DPDK_TARGET_MACH) | ||
30 | |||
31 | CONFIG_RTE_ARCH="i686" | ||
32 | CONFIG_RTE_ARCH_I686=y | ||
33 | diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc | ||
34 | index 60baf5b..0e4802d 100644 | ||
35 | --- a/config/defconfig_x86_64-native-linuxapp-gcc | ||
36 | +++ b/config/defconfig_x86_64-native-linuxapp-gcc | ||
37 | @@ -32,7 +32,7 @@ | ||
38 | |||
39 | #include "common_linuxapp" | ||
40 | |||
41 | -CONFIG_RTE_MACHINE="native" | ||
42 | +CONFIG_RTE_MACHINE=$(DPDK_TARGET_MACH) | ||
43 | |||
44 | CONFIG_RTE_ARCH="x86_64" | ||
45 | CONFIG_RTE_ARCH_X86_64=y | ||
46 | -- | ||
47 | 1.7.9.5 | ||
48 | |||
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-dpdk-enable-build-config-VHOST-in-common_linuxapp-config.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-dpdk-enable-build-config-VHOST-in-common_linuxapp-config.patch deleted file mode 100644 index e8ded8d0..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-dpdk-enable-build-config-VHOST-in-common_linuxapp-config.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From c1a59d62f2aa7656060d8ebcc8e45e852d931ff1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ong Boon Leong <boon.leong.ong@intel.com> | ||
3 | Date: Tue, 17 Feb 2015 00:23:12 +0800 | ||
4 | Subject: [PATCH] dpdk: enable VHOST build config in common_linuxapp config | ||
5 | |||
6 | Introduce CONFIG_VHOST_ENABLED for package config selection purpose in | ||
7 | building vhost feature. | ||
8 | |||
9 | Upstream-Status: Inappropriate [configuration] | ||
10 | |||
11 | Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com> | ||
12 | --- | ||
13 | config/common_linuxapp | 6 +++--- | ||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/config/common_linuxapp b/config/common_linuxapp | ||
17 | index 2f9643b..67f5edb 100644 | ||
18 | --- a/config/common_linuxapp | ||
19 | +++ b/config/common_linuxapp | ||
20 | @@ -361,9 +361,9 @@ CONFIG_RTE_LIBRTE_PIPELINE=y | ||
21 | # | ||
22 | CONFIG_RTE_LIBRTE_KNI=y | ||
23 | CONFIG_RTE_KNI_KO_DEBUG=n | ||
24 | -CONFIG_RTE_KNI_VHOST=n | ||
25 | +CONFIG_RTE_KNI_VHOST=$(CONFIG_VHOST_ENABLED) | ||
26 | CONFIG_RTE_KNI_VHOST_MAX_CACHE_SIZE=1024 | ||
27 | -CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n | ||
28 | +CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=$(CONFIG_VHOST_ENABLED) | ||
29 | CONFIG_RTE_KNI_VHOST_DEBUG_RX=n | ||
30 | CONFIG_RTE_KNI_VHOST_DEBUG_TX=n | ||
31 | |||
32 | @@ -372,7 +372,7 @@ CONFIG_RTE_KNI_VHOST_DEBUG_TX=n | ||
33 | # fuse-devel is needed to run vhost. | ||
34 | # fuse-devel enables user space char driver development | ||
35 | # | ||
36 | -CONFIG_RTE_LIBRTE_VHOST=n | ||
37 | +CONFIG_RTE_LIBRTE_VHOST=$(CONFIG_VHOST_ENABLED) | ||
38 | CONFIG_RTE_LIBRTE_VHOST_DEBUG=n | ||
39 | |||
40 | # | ||
41 | -- | ||
42 | 1.7.9.5 | ||
43 | |||
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-dpdk-enable-VHOST-and-ip_fragmentation-in-common_linuxapp.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-dpdk-enable-VHOST-and-ip_fragmentation-in-common_linuxapp.patch deleted file mode 100644 index 45ce5e05..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-dpdk-enable-VHOST-and-ip_fragmentation-in-common_linuxapp.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From 3d3c03d947394696565b3bb7bed8c900de057a28 Mon Sep 17 00:00:00 2001 | ||
2 | From: WU CHIA CHUAN <chia.chuan.wu@intel.com> | ||
3 | Date: Thu, 2 Jul 2015 15:59:18 +0800 | ||
4 | Subject: [PATCH] dpdk enable VHOST and ip_fragmentation in common_linuxapp config | ||
5 | |||
6 | Introduce CONFIG_VHOST_ENABLED for package config selection purpose in | ||
7 | building vhost feature. | ||
8 | |||
9 | Upstream-Status: Inappropriate [configuration] | ||
10 | |||
11 | Signed-off-by: WU CHIA CHUAN <chia.chuan.wu@intel.com> | ||
12 | --- | ||
13 | config/common_linuxapp | 11 ++++++++--- | ||
14 | 1 file changed, 8 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/config/common_linuxapp b/config/common_linuxapp | ||
17 | index 0b25f34..000f950 100644 | ||
18 | --- a/config/common_linuxapp | ||
19 | +++ b/config/common_linuxapp | ||
20 | @@ -406,19 +406,24 @@ CONFIG_RTE_LIBRTE_PIPELINE=y | ||
21 | CONFIG_RTE_LIBRTE_KNI=y | ||
22 | CONFIG_RTE_KNI_PREEMPT_DEFAULT=y | ||
23 | CONFIG_RTE_KNI_KO_DEBUG=n | ||
24 | -CONFIG_RTE_KNI_VHOST=n | ||
25 | +CONFIG_RTE_KNI_VHOST=$(CONFIG_VHOST_ENABLED) | ||
26 | CONFIG_RTE_KNI_VHOST_MAX_CACHE_SIZE=1024 | ||
27 | -CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n | ||
28 | +CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=$(CONFIG_VHOST_ENABLED) | ||
29 | CONFIG_RTE_KNI_VHOST_DEBUG_RX=n | ||
30 | CONFIG_RTE_KNI_VHOST_DEBUG_TX=n | ||
31 | |||
32 | # | ||
33 | +# Compile ip_fragmentation | ||
34 | +# | ||
35 | +CONFIG_RTE_IP_FRAG=y | ||
36 | + | ||
37 | +# | ||
38 | # Compile vhost library | ||
39 | # fuse-devel is needed to run vhost-cuse. | ||
40 | # fuse-devel enables user space char driver development | ||
41 | # vhost-user is turned on by default. | ||
42 | # | ||
43 | -CONFIG_RTE_LIBRTE_VHOST=n | ||
44 | +CONFIG_RTE_LIBRTE_VHOST=$(CONFIG_VHOST_ENABLED) | ||
45 | CONFIG_RTE_LIBRTE_VHOST_USER=y | ||
46 | CONFIG_RTE_LIBRTE_VHOST_DEBUG=n | ||
47 | |||
48 | -- | ||
49 | 1.7.9.5 | ||
50 | |||