meta-digi-arm: u-boot: fix trustfence checks logic

There are several possible values for TRUSTFENCE_UBOOT_ENV_DEK:

* Not defined: if the trustfence support is not included.
               Should not include the feature.
* 32 characters: when defining a valid key.
                 Should include the feature.
* "0": when explicitly disabling the feature.
       Should not include the feature
* <other>: Invalid value, should trigger the error.

This commits fixes the logic so that 'None' (no defined) is taken as a valid
value.

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
This commit is contained in:
Diaz de Grenu, Jose 2016-06-23 13:20:07 +02:00
parent 8bc38a2cbc
commit a91cc4e796
1 changed files with 1 additions and 1 deletions

View File

@ -60,6 +60,6 @@ python () {
d.appendVar("UBOOT_EXTRA_CONF", "CONFIG_ENCRYPT_IMAGE=y ")
if d.getVar("TRUSTFENCE_UBOOT_DEK_SIZE", True):
d.appendVar("UBOOT_EXTRA_CONF", "CONFIG_DEK_SIZE=%s " % d.getVar("TRUSTFENCE_UBOOT_DEK_SIZE"))
if d.getVar("TRUSTFENCE_UBOOT_ENV_DEK", True):
if (d.getVar("TRUSTFENCE_UBOOT_ENV_DEK", True) not in [None, "0"]):
d.appendVar("UBOOT_EXTRA_CONF", 'CONFIG_ENV_AES=y CONFIG_ENV_AES_KEY=\\"%s\\"' % d.getVar("TRUSTFENCE_UBOOT_ENV_DEK"))
}