diff options
-rw-r--r-- | conf/machine/intel-corei7-64.conf | 5 | ||||
-rw-r--r-- | meta-dpdk/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb | 5 | ||||
-rw-r--r-- | meta-dpdk/recipes-extended/dpdk/dpdk.inc | 18 |
3 files changed, 16 insertions, 12 deletions
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index a8097fc3..e3969827 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf | |||
@@ -16,6 +16,11 @@ MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" | |||
16 | 16 | ||
17 | MACHINE_EXTRA_RRECOMMENDS += "lms8" | 17 | MACHINE_EXTRA_RRECOMMENDS += "lms8" |
18 | 18 | ||
19 | # Enable optional dpdk: | ||
20 | COMPATIBLE_MACHINE_pn-dpdk = "intel-corei7-64" | ||
21 | COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "intel-corei7-64" | ||
22 | DPDK_TARGET_MACHINE ?= "atm" | ||
23 | |||
19 | XSERVER ?= "${XSERVER_X86_BASE} \ | 24 | XSERVER ?= "${XSERVER_X86_BASE} \ |
20 | ${XSERVER_X86_EXT} \ | 25 | ${XSERVER_X86_EXT} \ |
21 | ${XSERVER_X86_FBDEV} \ | 26 | ${XSERVER_X86_FBDEV} \ |
diff --git a/meta-dpdk/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb b/meta-dpdk/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb index c06cceb7..e40c63b8 100644 --- a/meta-dpdk/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb +++ b/meta-dpdk/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb | |||
@@ -14,7 +14,10 @@ SRC_URI = "https://github.com/Mellanox/dpdk-dev-libibverbs/archive/libibverbs-${ | |||
14 | SRC_URI[dpdk-dev-libibverbs.md5sum] = "65234ee278eb437a7069326f37cd4d86" | 14 | SRC_URI[dpdk-dev-libibverbs.md5sum] = "65234ee278eb437a7069326f37cd4d86" |
15 | SRC_URI[dpdk-dev-libibverbs.sha256sum] = "a6471515556cb8d10ad471bb7efb8cf760b248a28aceb57d4534d50d572f56cd" | 15 | SRC_URI[dpdk-dev-libibverbs.sha256sum] = "a6471515556cb8d10ad471bb7efb8cf760b248a28aceb57d4534d50d572f56cd" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "intel-corei7-64" | 17 | # A machine needs to enable this using: |
18 | # COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "<machine name>" | ||
19 | |||
20 | COMPATIBLE_MACHINE = "null" | ||
18 | COMPATIBLE_HOST_libc-musl_class-target = "null" | 21 | COMPATIBLE_HOST_libc-musl_class-target = "null" |
19 | 22 | ||
20 | S = "${WORKDIR}/${PN}-libibverbs-${PV}" | 23 | S = "${WORKDIR}/${PN}-libibverbs-${PV}" |
diff --git a/meta-dpdk/recipes-extended/dpdk/dpdk.inc b/meta-dpdk/recipes-extended/dpdk/dpdk.inc index ba382675..c1d01491 100644 --- a/meta-dpdk/recipes-extended/dpdk/dpdk.inc +++ b/meta-dpdk/recipes-extended/dpdk/dpdk.inc | |||
@@ -12,7 +12,10 @@ SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \ | |||
12 | file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \ | 12 | file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \ |
13 | " | 13 | " |
14 | 14 | ||
15 | COMPATIBLE_MACHINE = "intel-corei7-64" | 15 | # A machine needs to enable this using: |
16 | # COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "<machine name>" | ||
17 | |||
18 | COMPATIBLE_MACHINE = "null" | ||
16 | COMPATIBLE_HOST_libc-musl_class-target = "null" | 19 | COMPATIBLE_HOST_libc-musl_class-target = "null" |
17 | 20 | ||
18 | 21 | ||
@@ -55,16 +58,9 @@ export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac" | |||
55 | # process mapping. The supported target machine is listed under | 58 | # process mapping. The supported target machine is listed under |
56 | # dpdk/mk/machine | 59 | # dpdk/mk/machine |
57 | def get_dpdk_target_mach(bb, d): | 60 | def get_dpdk_target_mach(bb, d): |
58 | target_arch = d.getVar('MACHINE_ARCH', True) | 61 | target_arch = d.getVar('DPDK_TARGET_MACHINE', True) |
59 | multiarch_options = { | 62 | if target_arch: |
60 | "mohonpeak64": "atm", | 63 | target_arch |
61 | "mohonpeak32": "atm", | ||
62 | "crystalforest": "ivb", | ||
63 | "intel_corei7_64": "atm", | ||
64 | } | ||
65 | |||
66 | if target_arch in multiarch_options : | ||
67 | return multiarch_options[target_arch] | ||
68 | return "default" | 64 | return "default" |
69 | 65 | ||
70 | do_configure () { | 66 | do_configure () { |