fiq_debugger: merge from linux 3.10

[firefly-linux-kernel-4.4.55.git] / drivers / staging / android / fiq_debugger / Kconfig

diff --git a/drivers/staging/android/fiq_debugger/Kconfig b/drivers/staging/android/fiq_debugger/Kconfig
index 7b50df1528b4f03b538da50eaa2a4f8c0f12ca08..38eeac85acc0572f84f099dd88629e8b09f4c38a 100644 (file)
--- a/drivers/staging/android/fiq_debugger/Kconfig
+++ b/drivers/staging/android/fiq_debugger/Kconfig
@@ -42,12 +42,12 @@ config FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE
          If enabled, this puts the fiq debugger into console mode by default.
          Otherwise, the fiq debugger will start out in debug mode.
 
-config FIQ_DEBUGGER_EL3_TO_EL1
-       bool "Uart FIQ is captured by EL3, then passed to EL1"
-       depends on FIQ_DEBUGGER && ARM64
+config FIQ_DEBUGGER_TRUST_ZONE
+       bool "Uart FIQ is captured by trust zone, then passed to non-secure world"
+       depends on FIQ_DEBUGGER
        default n
        help
-         It is for ARM V8 arch.
+         It is for ARM v7/V8 arch.
 
 config FIQ_DEBUGGER_UART_OVERLAY
        bool "Install uart DT overlay"