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

[oweals/u-boot.git] / arch / arm / mach-imx / Kconfig

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index cd8b8d2882983beebc0f9e6e7d271b8326333ee5..3aec89d440a013be33edd5acebc37033f7179494 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,9 +1,18 @@
+config HAS_CAAM
+       bool
+
 config IMX_CONFIG
        string
 
 config ROM_UNIFIED_SECTIONS
        bool
 
+config SYSCOUNTER_TIMER
+       bool
+
+config GPT_TIMER
+       bool
+
 config IMX_RDC
        bool "i.MX Resource domain controller driver"
        depends on ARCH_MX6 || ARCH_MX7
@@ -28,7 +37,7 @@ config USE_IMXIMG_PLUGIN
 config SECURE_BOOT
        bool "Support i.MX HAB features"
        depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5
-       select FSL_CAAM
+       select FSL_CAAM if HAS_CAAM
        imply CMD_DEKBLOB
        help
          This option enables the support for secure boot (HAB).
@@ -61,3 +70,11 @@ config CMD_HDMIDETECT
        help
          This enables the 'hdmidet' command which detects if an HDMI monitor
          is connected.
+
+config NXP_BOARD_REVISION
+       bool "Read NXP board revision from fuses"
+       depends on ARCH_MX6 || ARCH_MX7
+       help
+         NXP boards based on i.MX6/7 contain the board revision information
+         stored in the fuses. Select this option if you want to be able to
+         retrieve the board revision information.