From dc921fcd8d4da30757d284e8593b236d5370a40f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 25 Sep 2017 12:38:22 -0500 Subject: 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 Signed-off-by: Saul Wold --- conf/machine/intel-corei7-64.conf | 5 +++++ meta-qat/recipes-extended/openssl-qat/openssl-qat.inc | 2 +- meta-qat/recipes-extended/qat/qat16.inc | 2 +- meta-qat/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index e3969827..78a1f6e9 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" COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "intel-corei7-64" DPDK_TARGET_MACHINE ?= "atm" +# Enable optional QAT items: +COMPATIBLE_MACHINE_pn-openssl-qat = "intel-corei7-64" +COMPATIBLE_MACHINE_pn-qat16 = "intel-corei7-64" +COMPATIBLE_MACHINE_pn-zlib-qat = "intel-corei7-64" + XSERVER ?= "${XSERVER_X86_BASE} \ ${XSERVER_X86_EXT} \ ${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 cbac5992..ff22825d 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} =+ "\ ${OPENSSL_PREFIX}${base_libdir}/ssl/openssl.cnf \ " -COMPATIBLE_MACHINE = "intel-corei7-64" +COMPATIBLE_MACHINE = "null" diff --git a/meta-qat/recipes-extended/qat/qat16.inc b/meta-qat/recipes-extended/qat/qat16.inc index cf112bbd..ad117ba1 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 \ file://qat16_2.5.0-80-qat-Added-include-dir-path.patch \ " -COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" +COMPATIBLE_MACHINE = "null" COMPATIBLE_HOST_linux-gnux32 = "null" S = "${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 f5b247b2..90e036f7 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 SRC_URI[zlibqat.md5sum] = "dfde8618198aa8d35ecc00d10dcc7000" SRC_URI[zlibqat.sha256sum] = "8e5786400bbc2a879ae705c864ec63b53ae019b4f2d1c94524a97223847b6e46" -COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" +COMPATIBLE_MACHINE = "null" ZLIB_VERSION = "1.2.8" ZLIB_QAT_VERSION = "0.4.7-002" -- cgit v1.2.3-54-g00ecf