From e6672392e79887f15ede2f594c69fd95d7c9ade2 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Thu, 25 Aug 2016 19:03:19 +0200 Subject: [PATCH] mx7_common: add secure boot support 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 Signed-off-by: Gary Bisson --- 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 55d8fcf4d4..68d1661a38 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 748029c26a..06452288ba 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -72,4 +72,13 @@ #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 8759685c1d..4d65b19274 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -22,10 +22,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -/* Uncomment to enable secure boot support */ -/* #define CONFIG_SECURE_BOOT */ -#define CONFIG_CSF_SIZE 0x4000 - /* Network */ #define CONFIG_FEC_MXC #define CONFIG_MII -- 2.34.1