Skip to content

Commit 6756530

Browse files
committed
digi: add dependencies to NXP-based SOM TrustFence options
These options and functions are not available for an STM-based SOM and Yocto would complain of undefined values or functions, otherwise. Signed-off-by: Hector Palacios <[email protected]>
1 parent 2d4cc59 commit 6756530

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ config ENV_AES
7474

7575
config ENV_AES_CAAM_KEY
7676
bool "Use CAAM internal key"
77-
depends on ENV_AES
77+
depends on HAS_CAAM
7878
help
7979
Use the internal CAAM secure key for environment encryption which
8080
uses AES-256-CCM.

common/Kconfig.boot

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ if SIGN_IMAGE
2020

2121
config UNLOCK_SRK_REVOKE
2222
bool "Unlock the SRK_REVOKE eFuse field"
23+
depends on CC6UL
2324
help
2425
In closed devices, HAB, by default, sets the SRK_REVOKE_LOCK sticky
2526
bit in the OCOTP controller to write protect the SRK_REVOKE eFuse
@@ -48,13 +49,15 @@ config KEY_INDEX
4849
Defines the key index for the signature process.
4950

5051
config DEK_PATH
52+
depends on HAS_CAAM
5153
string "Data Encription Key path for encryption of the signed image of the signed image"
5254
help
5355
Define to the DEK path to enable encryption of the signed U-boot
5456
image. Supported DEK sizes are 128, 192 and 256 bits.
5557

5658
config SIGN_MODE
57-
string "Sign mode"
59+
string
60+
depends on AHAB_BOOT || IMX_HAB
5861
default "AHAB" if AHAB_BOOT
5962
default "HAB" if IMX_HAB
6063
help

common/image.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
#include <u-boot/sha1.h>
4242
#include <linux/errno.h>
4343
#include <asm/io.h>
44+
#if defined(CONFIG_IMX_HAB) || defined(CONFIG_AHAB_BOOT)
4445
#include <asm/mach-imx/hab.h>
46+
#endif
4547
#ifdef CONFIG_AUTH_ARTIFACTS
4648
#include "../board/digi/common/auth.h"
4749
#endif
@@ -1365,11 +1367,13 @@ int boot_get_ramdisk(int argc, char *const argv[], bootm_headers_t *images,
13651367
*rd_start, *rd_end);
13661368

13671369
#ifdef CONFIG_AUTH_ARTIFACTS
1370+
#if defined(CONFIG_IMX_HAB) || defined(CONFIG_AHAB_BOOT)
13681371
if (rd_data && imx_hab_is_enabled() && !authenticated) {
13691372
printf("Ramdisk authentication is not supported\n");
13701373
return 1;
13711374
}
1372-
#endif
1375+
#endif /* CONFIG_IMX_HAB || CONFIG_AHAB_BOOT */
1376+
#endif /* CONFIG_AUTH_ARTIFACTS */
13731377
return 0;
13741378
}
13751379

0 commit comments

Comments
 (0)