Merge git://git.denx.de/u-boot-samsung

[u-boot] / arch / arm / imx-common / Kconfig

diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig
index c6b38bcaa6ed1f09cd780521d184f431133beb20..a6b61ad20a354f113d6ce33438518bf3af304875 100644 (file)
--- a/arch/arm/imx-common/Kconfig
+++ b/arch/arm/imx-common/Kconfig
@@ -18,11 +18,16 @@ config IMX_BOOTAUX
        help
          bootaux [addr] to boot auxiliary core.
 
-config MX7_SEC
-       bool "Support booting MX7 in secure mode"
-       depends on ARCH_MX7
+config USE_IMXIMG_PLUGIN
+       bool "Use imximage plugin code"
+       depends on ARCH_MX7 || ARCH_MX6
+       help
+         i.MX6/7 supports DCD and Plugin. Enable this configuration
+         to use Plugin, otherwise DCD will be used.
+
+config SECURE_BOOT
+       bool "Support i.MX HAB features"
+       depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5
        help
-         NXP kernel requires to boot MX7 in secure mode. Select
-         this options if you want to boot a NXP kernel. In order
-         to boot a mainline kernel this option needs to be
-         unselected.
+         This option enables the support for secure boot (HAB).
+         See doc/README.mxc_hab for more details.