nxp: Move FSL_SEC_MON related options to arch/Kconfig.nxp

The options related to FSL_SEC_MON are part of the chain of trust
related options and should be under that menu, so move it there.
Furthermore we don't need to prompt for the driver itself but do need to
allow for configuration of the monitor endianess.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/Kconfig.nxp b/arch/Kconfig.nxp
index 5a8c382ed753abe2ccd0b08ff2f4a60b0fbb651f..ef9087d019738e73c9b6eb6125c6c074efd5fa76 100644 (file)
--- a/arch/Kconfig.nxp
+++ b/arch/Kconfig.nxp
@@ -84,6 +84,28 @@ config SYS_FSL_SFP_VER_3_4
 
 endchoice
 
+config FSL_SEC_MON
+       bool
+       help
+         Freescale Security Monitor block is responsible for monitoring
+         system states.
+         Security Monitor can be transitioned on any security failures,
+         like software violations or hardware security violations.
+
+choice
+       prompt "Security monitor interaction endianess"
+       depends on FSL_SEC_MON
+       default SYS_FSL_SEC_MON_BE if PPC
+       default SYS_FSL_SEC_MON_LE
+
+config SYS_FSL_SEC_MON_LE
+       bool "Security monitor interactions are little endian"
+
+config SYS_FSL_SEC_MON_BE
+       bool "Security monitor interactions are big endian"
+
+endchoice
+
 config SPL_UBOOT_KEY_HASH
        string "Non-SRK key hash for U-Boot public/private key pair"
        depends on SPL

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 515d3668395d5322208a4567264d3c541c24dc37..119014a37a91a97ac9075c279d2453094012f3e8 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -302,28 +302,6 @@ config FSL_IIM
        bool "Enable FSL IC Identification Module (IIM) driver"
        depends on ARCH_MX5
 
-config FSL_SEC_MON
-       bool "Enable FSL SEC_MON Driver"
-       help
-         Freescale Security Monitor block is responsible for monitoring
-         system states.
-         Security Monitor can be transitioned on any security failures,
-         like software violations or hardware security violations.
-
-choice
-       prompt "Security monitor interaction endianess"
-       depends on FSL_SEC_MON
-       default SYS_FSL_SEC_MON_BE if PPC
-       default SYS_FSL_SEC_MON_LE
-
-config SYS_FSL_SEC_MON_LE
-       bool "Security monitor interactions are little endian"
-
-config SYS_FSL_SEC_MON_BE
-       bool "Security monitor interactions are big endian"
-
-endchoice
-
 config IRQ
        bool "Interrupt controller"
        help