Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 explicetily 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: Jose Diaz de Grenu de Pedro <Jose.DiazdeGrenudePedro@digi.com>
This commit is contained in:
Jose Diaz de Grenu de Pedro 2016-06-20 15:03:05 +02:00
parent ba6b5ffd8c
commit 62e0e1c6c6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
View File

@ -38,7 +38,7 @@ python __anonymous() {
bb.fatal("NXP's CST tool needs to be installed and a PKI tree generated. Please download it from the NXP website at http://www.nxp.com/pages/i.mx-design-tools:IMX_DESIGN?fsrch=1&sr=1&pageNum=1")
if (d.getVar("TRUSTFENCE_UBOOT_ENCRYPT", True) == "1") and (d.getVar("TRUSTFENCE_UBOOT_SIGN", True) != "1"):
bb.fatal("Only signed U-Boot images can be encrypted. Generate signed images (TRUSTFENCE_UBOOT_SIGN=1) or remove encryption (TRUSTFENCE_UBOOT_ENCRYPT=0)")
if (d.getVar("TRUSTFENCE_UBOOT_ENV_DEK", True) != "0"):
if (d.getVar("TRUSTFENCE_UBOOT_ENV_DEK", True) not in [None, "0"]):
if (d.getVar("TRUSTFENCE_UBOOT_ENCRYPT", True) != "1"):
bb.warn("It is strongly recommended to encrypt the U-Boot image when using environment encrpytion. Consider defining TRUSTFENCE_UBOOT_ENCRYPT=1")
if (len(d.getVar("TRUSTFENCE_UBOOT_ENV_DEK", True)) != 32):