Eric Lee / smarc-uboot

19
Download as
Browse Code ยป

Commit d4c01cd3f6f5ba59ca17ebf52f610f629895ac7a

Authored by Breno Lima
Committed by Ye Li
1 parent 3c79e2d9a7
Exists in smarc-imx_v2017.03_o8.1.0_1.3.0_8m and in 1 other branch smarc-imx_v2017.03_4.9.88_2.0.0_ga

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 <breno.lima@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

Showing 3 changed files with 2 additions and 8 deletions Side-by-side Diff

arch/arm/imx-common/Kconfig
Diff comments   View file @ d4c01cd
... ... @@ -39,8 +39,8 @@
39 39  
40 40 config SECURE_BOOT
41 41 bool "Support i.MX HAB features"
42   - depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 || ARCH_IMX8M
43   - select FSL_CAAM if !MX6ULL && !MX6SLL && !MX6SL && !IMX8M
  42 + depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 || ARCH_IMX8M || ARCH_MX7ULP
  43 + select FSL_CAAM if !MX6ULL && !MX6SLL && !MX6SL && !IMX8M && !MX7ULP
44 44 help
45 45 This option enables the support for secure boot (HAB).
46 46 See doc/README.mxc_hab for more details.
include/configs/mx7ulp_arm2.h
Diff comments   View file @ d4c01cd
... ... @@ -12,9 +12,6 @@
12 12 #include <linux/sizes.h>
13 13 #include <asm/arch/imx-regs.h>
14 14  
15   -/*Uncomment it to use secure boot*/
16   -/*#define CONFIG_SECURE_BOOT*/
17   -
18 15 #ifdef CONFIG_SECURE_BOOT
19 16 #ifndef CONFIG_CSF_SIZE
20 17 #define CONFIG_CSF_SIZE 0x4000
include/configs/mx7ulp_evk.h
Diff comments   View file @ d4c01cd
... ... @@ -13,9 +13,6 @@
13 13 #include <linux/sizes.h>
14 14 #include <asm/arch/imx-regs.h>
15 15  
16   -/*Uncomment it to use secure boot*/
17   -/*#define CONFIG_SECURE_BOOT*/
18   -
19 16 #ifdef CONFIG_SECURE_BOOT
20 17 #ifndef CONFIG_CSF_SIZE
21 18 #define CONFIG_CSF_SIZE 0x4000