Selecting the proper options to enable the build of the HAB tools.
Note, this support is disabled by default, one will have to select the SECURE_BOOT configuration through menuconfig to enable it.
See doc/README.mxc_hab for more details.
Also remove duplicate options from board config headers.
Cc: Stefan Agner stefan.agner@toradex.com Signed-off-by: Gary Bisson gary.bisson@boundarydevices.com --- include/configs/colibri_imx7.h | 4 ---- include/configs/mx7_common.h | 9 +++++++++ include/configs/mx7dsabresd.h | 4 ---- 3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 9da219c..486f2a4 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -29,10 +29,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)
-/* Uncomment to enable secure boot support */ -/* #define CONFIG_SECURE_BOOT */ -#define CONFIG_CSF_SIZE 0x4000 - #define CONFIG_CMD_BMODE
/* Network */ diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 7295fa6..c339e24 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -76,4 +76,13 @@ #define CONFIG_ARMV7_PSCI_NR_CPUS 2 #define CONFIG_ARMV7_SECURE_BASE 0x00900000
+/* Secure boot (HAB) support */ +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CSF_SIZE 0x2000 +#define CONFIG_SYS_FSL_SEC_COMPAT 4 +#define CONFIG_FSL_CAAM +#define CONFIG_CMD_DEKBLOB +#define CONFIG_SYS_FSL_SEC_LE +#endif + #endif diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 822d81f..f2d5dea 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -24,10 +24,6 @@
#define CONFIG_DISPLAY_BOARDINFO
-/* Uncomment to enable secure boot support */ -/* #define CONFIG_SECURE_BOOT */ -#define CONFIG_CSF_SIZE 0x4000 - /* Network */ #define CONFIG_FEC_MXC #define CONFIG_MII