From 2c8eaecc09fa934b275a46fcb94c4a50ee628871 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Tue, 5 May 2020 18:02:35 +0200
Subject: [PATCH] cryptochip: use MACHINE_FEATURE to conditionally include
 related recipes

Use 'cryptochip' MACHINE_FEATURE to conditionally include cryptoauthlib
recipe.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 meta-digi-arm/conf/machine/ccimx6qpsbc.conf          | 4 ----
 meta-digi-arm/conf/machine/include/ccimx6ul.inc      | 1 -
 meta-digi-arm/conf/machine/include/ccimx8mn.inc      | 1 -
 meta-digi-arm/conf/machine/include/ccimx8x.inc       | 1 -
 meta-digi-arm/conf/machine/include/digi-defaults.inc | 4 ++++
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
index 5c3d16973..8b5fbea57 100644
--- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
@@ -12,10 +12,6 @@ HAS_WIFI_VIRTWLANS = "true"
 # Wireless p2p interface
 WLAN_P2P_DEVICE_NAME ?= "ccimx6qp-p2p"
 
-MACHINE_EXTRA_RRECOMMENDS += " \
-    cryptoauthlib \
-"
-
 MACHINE_FEATURES += "cryptochip"
 
 # Firmware
diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
index 39332c141..a6a516d88 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -34,7 +34,6 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     ${MACHINE_FIRMWARE} \
     ${WIRELESS_MODULE} \
     ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)} \
-    cryptoauthlib \
     cryptodev-module \
 "
 MACHINE_EXTRA_RRECOMMENDS_remove_use-mainline-bsp = "${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
diff --git a/meta-digi-arm/conf/machine/include/ccimx8mn.inc b/meta-digi-arm/conf/machine/include/ccimx8mn.inc
index da1365361..d07ef0ccf 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8mn.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8mn.inc
@@ -50,7 +50,6 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     ${MACHINE_FIRMWARE} \
     ${WIRELESS_MODULE} \
     cryptodev-module \
-    cryptoauthlib \
 "
 
 MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth cryptochip mca"
diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc
index 583b3984e..cd5b5e5ef 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8x.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc
@@ -53,7 +53,6 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     ${MACHINE_FIRMWARE} \
     ${WIRELESS_MODULE} \
     cryptodev-module \
-    cryptoauthlib \
 "
 
 MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth cryptochip pci mca"
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index 231bde899..40a7604bd 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -66,3 +66,7 @@ BOOTABLE_ARTIFACTS ?= ""
 MACHINE_EXTRA_RDEPENDS += " \
     ${@bb.utils.contains("MACHINE_FEATURES", "mca", "mca-tool", "", d)} \
 "
+# Extra RRECOMMENDS
+MACHINE_EXTRA_RRECOMMENDS += " \
+    ${@bb.utils.contains("MACHINE_FEATURES", "cryptochip", "cryptoauthlib", "", d)} \
+"