From d4c01cd3f6f5ba59ca17ebf52f610f629895ac7a Mon Sep 17 00:00:00 2001 From: Breno Lima Date: Tue, 20 Mar 2018 10:09:47 -0300 Subject: [PATCH] MLK-17897: mx7ulp: Move CONFIG_SECURE_BOOT option to Kconfig Since commit 6e1f4d2652e79 ("arm: imx-common: add SECURE_BOOT option to Kconfig") it's preferable to select CONFIG_SECURE_BOOT via Kconfig. Add ARCH_MX7ULP as a CONFIG_SECURE_BOOT dependency, do not select CONFIG_FSL_CAAM since CAAM is not implemented for i.MX7ULP yet. Signed-off-by: Breno Lima Reviewed-by: Ye Li --- arch/arm/imx-common/Kconfig | 4 ++-- include/configs/mx7ulp_arm2.h | 3 --- include/configs/mx7ulp_evk.h | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig index f557897106..a7252a082d 100644 --- a/arch/arm/imx-common/Kconfig +++ b/arch/arm/imx-common/Kconfig @@ -39,8 +39,8 @@ config USE_IMXIMG_PLUGIN config SECURE_BOOT bool "Support i.MX HAB features" - depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 || ARCH_IMX8M - select FSL_CAAM if !MX6ULL && !MX6SLL && !MX6SL && !IMX8M + depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 || ARCH_IMX8M || ARCH_MX7ULP + select FSL_CAAM if !MX6ULL && !MX6SLL && !MX6SL && !IMX8M && !MX7ULP help This option enables the support for secure boot (HAB). See doc/README.mxc_hab for more details. diff --git a/include/configs/mx7ulp_arm2.h b/include/configs/mx7ulp_arm2.h index a7b5b0cfb9..ba4c20baa3 100644 --- a/include/configs/mx7ulp_arm2.h +++ b/include/configs/mx7ulp_arm2.h @@ -12,9 +12,6 @@ #include #include -/*Uncomment it to use secure boot*/ -/*#define CONFIG_SECURE_BOOT*/ - #ifdef CONFIG_SECURE_BOOT #ifndef CONFIG_CSF_SIZE #define CONFIG_CSF_SIZE 0x4000 diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 7d07dea102..faac54ac81 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -13,9 +13,6 @@ #include #include -/*Uncomment it to use secure boot*/ -/*#define CONFIG_SECURE_BOOT*/ - #ifdef CONFIG_SECURE_BOOT #ifndef CONFIG_CSF_SIZE #define CONFIG_CSF_SIZE 0x4000 -- 2.17.1