Revert "trustfence: disable SDCARD image generation when encryption is enabled"

When encryption is enabled, the signed U-Boot image will be used for the uSD.
This allows the uSD image to boot the device and recover it from the U-Boot
console, which is its main purpose. Nevertheless, the uSD image will not be
able to boot Linux.

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

This reverts commit 2e13e194d9.
This commit is contained in:
Diaz de Grenu, Jose 2016-10-20 14:53:26 +02:00
parent 796334fa9a
commit 262ade8908
2 changed files with 2 additions and 5 deletions

View File

@ -131,8 +131,8 @@ authentication failure.
* The Micrel PHY KSZ9031 may take between five and six seconds to
auto-negotiate with Gigabit switches
* Secure uSD booting only supports booting signed images. A uSD image is not
generated if TrustFence (TM) image encryption support is enabled.
* If TrustFence (TM) image encryption support is enabled, the uSD image will
boot a signed U-Boot only.
# Support Contact Information

View File

@ -65,6 +65,3 @@ python () {
if (d.getVar("TRUSTFENCE_ENCRYPT_ENVIRONMENT", True) == "1"):
d.appendVar("UBOOT_EXTRA_CONF", 'CONFIG_ENV_AES=y CONFIG_ENV_AES_CAAM_KEY=y')
}
# SDCARD image is not supported when encryption is enabled, so disable it in such cases
IMAGE_FSTYPES_remove = "${@'' if d.getVar('TRUSTFENCE_DEK_PATH', True) == '0' else 'sdcard'}"