Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 36d279784b20089f10109dd6561620d852cb810f

Authored by Breno Lima
Committed by Ye Li
1 parent a091145c41
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-17916: cmd: dek_blob: Convert CONFIG_CMD_DEKBLOB to Kconfig 

Currently the dek_blob command is enabled by default if
CONFIG_SECURE_BOOT is defined. Move CONFIG_CMD_DEKBLOB
enablement to Kconfig so users can select if required
by their application.

This commit is based in a previous submission from Simon Glass
in U-Boot upstream:
https://lists.denx.de/pipermail/u-boot/2017-April/289052.html

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 93e089f9202b2f9600a87eae2472db21fe5d7459)

Showing 4 changed files with 10 additions and 5 deletions Side-by-side Diff

arch/arm/imx-common/Kconfig
Diff comments   View file @ 36d2797
... ... @@ -45,6 +45,16 @@
45 45 This option enables the support for secure boot (HAB).
46 46 See doc/README.mxc_hab for more details.
47 47  
  48 +config CMD_DEKBLOB
  49 + bool "Support the 'dek_blob' command"
  50 + depends on !MX6ULL && !MX6SLL && !MX6SL && !IMX8M && !MX7ULP
  51 + depends on SECURE_BOOT
  52 + help
  53 + This enables the 'dek_blob' command which is used with the
  54 + Freescale secure boot mechanism. This command encapsulates and
  55 + creates a blob of data. See also CMD_BLOB and doc/README.mxc_hab for
  56 + more information.
  57 +
48 58 config FSL_MFGPROT
49 59 bool "Support the 'mfgprot' command"
50 60 depends on SECURE_BOOT && ARCH_MX7
include/configs/mx6_common.h
Diff comments   View file @ 36d2797
... ... @@ -111,9 +111,6 @@
111 111 /* Secure boot (HAB) support */
112 112 #ifdef CONFIG_SECURE_BOOT
113 113 #define CONFIG_CSF_SIZE 0x4000
114   -#if !defined(CONFIG_MX6ULL) && !defined(CONFIG_MX6SLL) && !defined(CONFIG_MX6SL)
115   -#define CONFIG_CMD_DEKBLOB
116   -#endif
117 114 #ifdef CONFIG_SPL_BUILD
118 115 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
119 116 #endif
include/configs/mx7_common.h
Diff comments   View file @ 36d2797
... ... @@ -71,7 +71,6 @@
71 71 /* Secure boot (HAB) support */
72 72 #ifdef CONFIG_SECURE_BOOT
73 73 #define CONFIG_CSF_SIZE 0x4000
74   -#define CONFIG_CMD_DEKBLOB
75 74 #endif
76 75  
77 76 #ifdef CONFIG_IMX_OPTEE
scripts/config_whitelist.txt
Diff comments   View file @ 36d2797
... ... @@ -471,7 +471,6 @@
471 471 CONFIG_CMD_CRAMFS
472 472 CONFIG_CMD_DATE
473 473 CONFIG_CMD_DEFAULTENV_VARS
474   -CONFIG_CMD_DEKBLOB
475 474 CONFIG_CMD_DFL
476 475 CONFIG_CMD_DIAG
477 476 CONFIG_CMD_DISPLAY