From 3980c84605c4b3c472aefc865903d837a68f8371 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 31 Jan 2019 13:59:18 +0100 Subject: [PATCH] ccimx8x: move Atmel CryptoAuth library and engine to SOM file The cryptochip is a device included in the SOM, it is not platform dependant. Signed-off-by: Arturo Buzarra --- meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf | 5 ----- meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf | 5 ----- meta-digi-arm/conf/machine/include/ccimx8x.inc | 2 ++ 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf index f8b6d94ee..b480f3e32 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf @@ -11,11 +11,6 @@ WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-mod # Wireless p2p interface WLAN_P2P_INTERFACE ?= "p2p0" -MACHINE_EXTRA_RRECOMMENDS += " \ - cryptoauthlib \ - cryptoauth-openssl-engine \ -" - # Firmware MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index 569350fee..77422889e 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -11,11 +11,6 @@ WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-mod # Wireless p2p interface WLAN_P2P_INTERFACE ?= "p2p0" -MACHINE_EXTRA_RRECOMMENDS += " \ - cryptoauthlib \ - cryptoauth-openssl-engine \ -" - # Firmware MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}" diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index 29fad1f67..0b01f0815 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -40,6 +40,8 @@ MACHINE_EXTRA_RRECOMMENDS += " \ ${MACHINE_FIRMWARE} \ ${WIRELESS_MODULE} \ cryptodev-module \ + cryptoauthlib \ + cryptoauth-openssl-engine \ " MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth cryptochip"