From: Simon Glass <sjg@chromium.org>
Date: Thu, 27 Apr 2017 04:28:06 +0000 (-0600)
Subject: Convert CONFIG_CMD_DEKBLOB to Kconfig
X-Git-Tag: v2025.01-rc5-pxa1908~7099
X-Git-Url: http://git.dujemihanovic.xyz/html/%7B%7B%20%24style.Permalink%20%7D%7D?a=commitdiff_plain;h=d569c95ec0daf8749ac07414f979bb9483d2d8a6;p=u-boot.git

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>
---

diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig
index 5eb3ba0141..25cbd12c89 100644
--- a/arch/arm/imx-common/Kconfig
+++ b/arch/arm/imx-common/Kconfig
@@ -29,6 +29,7 @@ config SECURE_BOOT
 	bool "Support i.MX HAB features"
 	depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5
 	select FSL_CAAM
+	imply CMD_DEKBLOB
 	help
 	  This option enables the support for secure boot (HAB).
 	  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
 	  will set it back to normal.  This command currently
 	  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.
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index c841ca9115..21ac3fc357 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -84,7 +84,6 @@
 /* Secure boot (HAB) support */
 #ifdef CONFIG_SECURE_BOOT
 #define CONFIG_CSF_SIZE			0x2000
-#define CONFIG_CMD_DEKBLOB
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
 #endif
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index e2b05caa94..9a20c7732d 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -67,7 +67,6 @@
 /* Secure boot (HAB) support */
 #ifdef CONFIG_SECURE_BOOT
 #define CONFIG_CSF_SIZE			0x2000
-#define CONFIG_CMD_DEKBLOB
 #endif
 
 #endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bbb0a1dec0..3c1feed253 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -394,7 +394,6 @@ CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
 CONFIG_CMD_DATE
-CONFIG_CMD_DEKBLOB
 CONFIG_CMD_DFL
 CONFIG_CMD_DIAG
 CONFIG_CMD_DISPLAY