summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2017-09-25 17:38:22 (GMT)
committerSaul Wold <sgw@linux.intel.com>2017-09-25 22:53:57 (GMT)
commitdc921fcd8d4da30757d284e8593b236d5370a40f (patch)
treee6128556604f973ebe9c42e79124afbecd523489
parenta513894de8cbe7d6671f58f0c3f374e08d7af1b8 (diff)
downloadmeta-intel-dc921fcd8d4da30757d284e8593b236d5370a40f.tar.gz
qat: Move BSP specific configurations from recipes to machine.conf
The COMPATIBLE_MACHINE entry for qat recipes is set to 'null'. This will prevent arbitrary machines from trying to use the qat functionality. A compatible MACHINE must define itself as such for the qat recipes. Embedding BSP specific knowledge into the recipe will cause the recipe to slowly get out of date. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--conf/machine/intel-corei7-64.conf5
-rw-r--r--meta-qat/recipes-extended/openssl-qat/openssl-qat.inc2
-rw-r--r--meta-qat/recipes-extended/qat/qat16.inc2
-rw-r--r--meta-qat/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb2
4 files changed, 8 insertions, 3 deletions
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index e396982..78a1f6e 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -21,6 +21,11 @@ COMPATIBLE_MACHINE_pn-dpdk = "intel-corei7-64"
21COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "intel-corei7-64" 21COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "intel-corei7-64"
22DPDK_TARGET_MACHINE ?= "atm" 22DPDK_TARGET_MACHINE ?= "atm"
23 23
24# Enable optional QAT items:
25COMPATIBLE_MACHINE_pn-openssl-qat = "intel-corei7-64"
26COMPATIBLE_MACHINE_pn-qat16 = "intel-corei7-64"
27COMPATIBLE_MACHINE_pn-zlib-qat = "intel-corei7-64"
28
24XSERVER ?= "${XSERVER_X86_BASE} \ 29XSERVER ?= "${XSERVER_X86_BASE} \
25 ${XSERVER_X86_EXT} \ 30 ${XSERVER_X86_EXT} \
26 ${XSERVER_X86_FBDEV} \ 31 ${XSERVER_X86_FBDEV} \
diff --git a/meta-qat/recipes-extended/openssl-qat/openssl-qat.inc b/meta-qat/recipes-extended/openssl-qat/openssl-qat.inc
index cbac599..ff22825 100644
--- a/meta-qat/recipes-extended/openssl-qat/openssl-qat.inc
+++ b/meta-qat/recipes-extended/openssl-qat/openssl-qat.inc
@@ -122,4 +122,4 @@ FILES_${PN} =+ "\
122 ${OPENSSL_PREFIX}${base_libdir}/ssl/openssl.cnf \ 122 ${OPENSSL_PREFIX}${base_libdir}/ssl/openssl.cnf \
123 " 123 "
124 124
125COMPATIBLE_MACHINE = "intel-corei7-64" 125COMPATIBLE_MACHINE = "null"
diff --git a/meta-qat/recipes-extended/qat/qat16.inc b/meta-qat/recipes-extended/qat/qat16.inc
index cf112bb..ad117ba 100644
--- a/meta-qat/recipes-extended/qat/qat16.inc
+++ b/meta-qat/recipes-extended/qat/qat16.inc
@@ -18,7 +18,7 @@ SRC_URI="file://qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch \
18 file://qat16_2.5.0-80-qat-Added-include-dir-path.patch \ 18 file://qat16_2.5.0-80-qat-Added-include-dir-path.patch \
19 " 19 "
20 20
21COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" 21COMPATIBLE_MACHINE = "null"
22COMPATIBLE_HOST_linux-gnux32 = "null" 22COMPATIBLE_HOST_linux-gnux32 = "null"
23 23
24S = "${WORKDIR}/${ICP_DRIVER_TYPE}" 24S = "${WORKDIR}/${ICP_DRIVER_TYPE}"
diff --git a/meta-qat/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb b/meta-qat/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb
index f5b247b..90e036f 100644
--- a/meta-qat/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb
+++ b/meta-qat/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb
@@ -30,7 +30,7 @@ SRC_URI[zlib.sha256sum] = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166
30SRC_URI[zlibqat.md5sum] = "dfde8618198aa8d35ecc00d10dcc7000" 30SRC_URI[zlibqat.md5sum] = "dfde8618198aa8d35ecc00d10dcc7000"
31SRC_URI[zlibqat.sha256sum] = "8e5786400bbc2a879ae705c864ec63b53ae019b4f2d1c94524a97223847b6e46" 31SRC_URI[zlibqat.sha256sum] = "8e5786400bbc2a879ae705c864ec63b53ae019b4f2d1c94524a97223847b6e46"
32 32
33COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" 33COMPATIBLE_MACHINE = "null"
34 34
35ZLIB_VERSION = "1.2.8" 35ZLIB_VERSION = "1.2.8"
36ZLIB_QAT_VERSION = "0.4.7-002" 36ZLIB_QAT_VERSION = "0.4.7-002"