From b8f50680e540fc83c3c162cb81469956209bc408 Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Tue, 9 Aug 2016 13:48:52 +0200
Subject: [PATCH] meta-digi-arm: Exclude u-boot-fw-utils if U-Boot environment
 encryption is enabled

There is currently no support on fw_printenv/fw_setenv to access an
encrypted environment.

This commit removes the package if U-Boot environment encryption is
enabled to avoid environment corruption on access.

It also documents the issue as a known issue.

https://jira.digi.com/browse/DEL-2625

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 README.md                                                      | 3 +++
 meta-digi-arm/conf/machine/include/ccimx6.inc                  | 2 +-
 meta-digi-arm/conf/machine/include/ccimx6ul.inc                | 2 +-
 .../recipes-core/packagegroups/packagegroup-dey-core.bb        | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 515be72d0..2828707e7 100644
--- a/README.md
+++ b/README.md
@@ -88,6 +88,9 @@ Documentation is available online on the Digi documentation site:
 
 # Known Issues and Limitations
 
+* When using the TrustFence (TM) U-Boot environment encryption, access to the
+U-Boot environment from the Linux OS is not supported.
+
 ## Digi ConnectCore 6UL
 
 ## Digi ConnectCore 6UL Starter Kit
diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc
index b0d4e2a7c..2d73b7725 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6.inc
@@ -27,7 +27,7 @@ MACHINE_EXTRA_RDEPENDS += " \
     e2fsprogs-mke2fs \
     e2fsprogs-resize2fs \
     parted \
-    u-boot-fw-utils \
+    ${@base_conditional('TRUSTFENCE_ENCRYPT_ENVIRONMENT', '1', '', 'u-boot-fw-utils', d)} \
 "
 MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}"
 MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins cryptodev-module rng-tools"
diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
index e8aa9ce89..1b4302fe7 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -22,7 +22,7 @@ MACHINE_FIRMWARE ?= ""
 MACHINE_EXTRA_RDEPENDS += " \
     imx-kobs \
     mtd-utils-ubifs \
-    u-boot-fw-utils \
+    ${@base_conditional('TRUSTFENCE_ENCRYPT_ENVIRONMENT', '1', '', 'u-boot-fw-utils', d)} \
 "
 MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}"
 MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins cryptodev-module"
diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
index 7b6c6baa7..ecacb5581 100644
--- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
+++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
@@ -55,3 +55,5 @@ RRECOMMENDS_${PN} = "\
     ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
     ${MACHINE_EXTRA_RRECOMMENDS} \
 "
+
+do_package[vardeps] = "TRUSTFENCE_ENCRYPT_ENVIRONMENT"