Эх сурвалжийг харах

Convert CONFIG_CMD_DEKBLOB to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_DEKBLOB

Note: This option does not seem to actually be enabled by any board.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: imply under SECURE_BOOT for mx5/6/7]
Signed-off-by: Tom Rini <trini@konsulko.com>
Simon Glass 8 жил өмнө
parent
commit
d569c95ec0

+ 9 - 0
arch/arm/imx-common/Kconfig

@@ -29,6 +29,7 @@ config SECURE_BOOT
 	bool "Support i.MX HAB features"
 	bool "Support i.MX HAB features"
 	depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5
 	depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5
 	select FSL_CAAM
 	select FSL_CAAM
+	imply CMD_DEKBLOB
 	help
 	help
 	  This option enables the support for secure boot (HAB).
 	  This option enables the support for secure boot (HAB).
 	  See doc/README.mxc_hab for more details.
 	  See doc/README.mxc_hab for more details.
@@ -46,3 +47,11 @@ config CMD_BMODE
 	  on U-Boot.  Using the reset button or running bmode normal
 	  on U-Boot.  Using the reset button or running bmode normal
 	  will set it back to normal.  This command currently
 	  will set it back to normal.  This command currently
 	  supports i.MX53 and i.MX6.
 	  supports i.MX53 and i.MX6.
+
+config CMD_DEKBLOB
+	bool "Support the 'dek_blob' command"
+	help
+	  This enables the 'dek_blob' command which is used with the
+	  Freescale secure boot mechanism. This command encapsulates and
+	  creates a blob of data. See also CMD_BLOB and doc/README.mxc_hab for
+	  more information.

+ 0 - 1
include/configs/mx6_common.h

@@ -84,7 +84,6 @@
 /* Secure boot (HAB) support */
 /* Secure boot (HAB) support */
 #ifdef CONFIG_SECURE_BOOT
 #ifdef CONFIG_SECURE_BOOT
 #define CONFIG_CSF_SIZE			0x2000
 #define CONFIG_CSF_SIZE			0x2000
-#define CONFIG_CMD_DEKBLOB
 #ifdef CONFIG_SPL_BUILD
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
 #endif
 #endif

+ 0 - 1
include/configs/mx7_common.h

@@ -67,7 +67,6 @@
 /* Secure boot (HAB) support */
 /* Secure boot (HAB) support */
 #ifdef CONFIG_SECURE_BOOT
 #ifdef CONFIG_SECURE_BOOT
 #define CONFIG_CSF_SIZE			0x2000
 #define CONFIG_CSF_SIZE			0x2000
-#define CONFIG_CMD_DEKBLOB
 #endif
 #endif
 
 
 #endif
 #endif

+ 0 - 1
scripts/config_whitelist.txt

@@ -394,7 +394,6 @@ CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
 CONFIG_CMDLINE_TAG
 CONFIG_CMD_DATE
 CONFIG_CMD_DATE
-CONFIG_CMD_DEKBLOB
 CONFIG_CMD_DFL
 CONFIG_CMD_DFL
 CONFIG_CMD_DIAG
 CONFIG_CMD_DIAG
 CONFIG_CMD_DISPLAY
 CONFIG_CMD_DISPLAY