Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cryptochip: add cryptochip MACHINE_FEATURE in several recipes 

This simplifies some dependencies and makes them more explicit.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2018-06-29 17:55:42 +02:00
parent af1463179a
commit d9b333db05
5 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-arm/conf/machine/ccimx6qpsbc.conf
View File

@ -16,6 +16,8 @@ MACHINE_EXTRA_RRECOMMENDS += " \
cryptoauth-openssl-engine \
"
MACHINE_FEATURES += "cryptochip"
# Firmware
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"

2
meta-digi-arm/conf/machine/include/ccimx6ul.inc
View File

@ -41,7 +41,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \
cryptoauth-openssl-engine \
"
MACHINE_FEATURES += "wifi bluetooth"
MACHINE_FEATURES += "wifi bluetooth cryptochip"
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"

2
meta-digi-arm/conf/machine/include/ccimx8x.inc
View File

@ -34,7 +34,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \
cryptodev-module \
"
MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth"
MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth cryptochip"
# AARCH64 doesn't support compressed kernel images
KERNEL_IMAGETYPE = "Image"

13
meta-digi-dey/recipes-connectivity/openssl/openssl_%.bbappend
View File

@ -2,15 +2,12 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI += " \
file://0001-cryptodev-Fix-issue-with-signature-generation.patch \
file://0002-cryptodev-allow-copying-EVP-contexts.patch \
"
CRYPTOCHIP_COMMON_PATCHES = " \
file://0003-Modify-openssl.cnf-to-automatically-load-the-cryptoc.patch \
"
SRC_URI_append_ccimx6ul = " ${CRYPTOCHIP_COMMON_PATCHES}"
SRC_URI_append_ccimx6qpsbc = " ${CRYPTOCHIP_COMMON_PATCHES}"
SRC_URI_append_ccimx8x = " ${CRYPTOCHIP_COMMON_PATCHES}"
SRC_URI += " \
file://0001-cryptodev-Fix-issue-with-signature-generation.patch \
file://0002-cryptodev-allow-copying-EVP-contexts.patch \
${@bb.utils.contains("MACHINE_FEATURES", "cryptochip", "${CRYPTOCHIP_COMMON_PATCHES}", "", d)} \
"

7
meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
View File

@ -13,6 +13,7 @@ RDEPENDS_${PN} = "\
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-bt", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-btconfig", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-hdp", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "cryptochip", "dey-examples-cryptochip", "", d)} \
awsiotsdk-demo \
dey-examples-can \
dey-examples-cloudconnector \
@ -31,18 +32,12 @@ RDEPENDS_${PN}_append_ccimx6 = "\
RDEPENDS_${PN}_append_ccimx6ul = "\
dey-examples-adc \
dey-examples-adc-cmp \
dey-examples-cryptochip \
dey-examples-tamper \
"
RDEPENDS_${PN}_append_ccimx6qpsbc = "\
dey-examples-cryptochip \
"
RDEPENDS_${PN}_append_ccimx8x = "\
dey-examples-adc \
dey-examples-adc-cmp \
dey-examples-cryptochip \
dey-examples-tamper \
dey-examples-v4l2 \
"