From c59a5e6214be9573a5752aeddac6c43878ac5494 Mon Sep 17 00:00:00 2001 From: "Diaz de Grenu, Jose" Date: Wed, 24 Aug 2016 12:50:23 +0200 Subject: [PATCH] Revert "meta-digi-arm: Exclude u-boot-fw-utils if U-Boot environment encryption is" This reverts commit b8f50680e540fc83c3c162cb81469956209bc408. The support to read and write to an encrypted environment has been added, so there is no need to exclude the u-boot-fw-utils anymore. https://jira.digi.com/browse/DEL-2836 Signed-off-by: Diaz de Grenu, Jose --- 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, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ac8efaf71..a49edea04 100644 --- a/README.md +++ b/README.md @@ -93,9 +93,6 @@ Documentation is available online on the Digi documentation site: This is a list of known issues and limitations at the time of release. An updated list can be found on the online documentation. -* 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 * In the Bluetooth interface, the UART hardware flow control doesn’t work diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index 2d73b7725..b0d4e2a7c 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 \ - ${@base_conditional('TRUSTFENCE_ENCRYPT_ENVIRONMENT', '1', '', 'u-boot-fw-utils', d)} \ + u-boot-fw-utils \ " 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 1b4302fe7..e8aa9ce89 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 \ - ${@base_conditional('TRUSTFENCE_ENCRYPT_ENVIRONMENT', '1', '', 'u-boot-fw-utils', d)} \ + u-boot-fw-utils \ " 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 ecacb5581..7b6c6baa7 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb @@ -55,5 +55,3 @@ RRECOMMENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \ ${MACHINE_EXTRA_RRECOMMENDS} \ " - -do_package[vardeps] = "TRUSTFENCE_ENCRYPT_ENVIRONMENT"