Merge branch 'for-linus-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad...

[linux-block.git] / drivers / firmware / Kconfig

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index f028218815c6218c6415d8908816b92d5bbe810b..ba8d3d0ef32c7fc0dfb11f393a76d01be0f83c7e 100644 (file)
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -1,24 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
+# see Documentation/kbuild/kconfig-language.rst.
 #
 
 menu "Firmware Drivers"
 
-config ARM_PSCI_FW
-       bool
-
-config ARM_PSCI_CHECKER
-       bool "ARM PSCI checker"
-       depends on ARM_PSCI_FW && HOTPLUG_CPU && CPU_IDLE && !TORTURE_TEST
-       help
-         Run the PSCI checker during startup. This checks that hotplug and
-         suspend operations work correctly when using PSCI.
-
-         The torture tests may interfere with the PSCI checker by turning CPUs
-         on and off through hotplug, so for now torture tests and PSCI checker
-         are mutually exclusive.
-
 config ARM_SCMI_PROTOCOL
        bool "ARM System Control and Management Interface (SCMI) Message Protocol"
        depends on ARM || ARM64 || COMPILE_TEST
@@ -219,7 +206,7 @@ config FW_CFG_SYSFS_CMDLINE
 
 config INTEL_STRATIX10_SERVICE
        tristate "Intel Stratix10 Service Layer"
-       depends on HAVE_ARM_SMCCC
+       depends on ARCH_STRATIX10 && HAVE_ARM_SMCCC
        default n
        help
          Intel Stratix10 service layer runs at privileged exception level,
@@ -268,9 +255,26 @@ config TI_SCI_PROTOCOL
          This protocol library is used by client drivers to use the features
          provided by the system controller.
 
+config TRUSTED_FOUNDATIONS
+       bool "Trusted Foundations secure monitor support"
+       depends on ARM && CPU_V7
+       help
+         Some devices (including most early Tegra-based consumer devices on
+         the market) are booted with the Trusted Foundations secure monitor
+         active, requiring some core operations to be performed by the secure
+         monitor instead of the kernel.
+
+         This option allows the kernel to invoke the secure monitor whenever
+         required on devices using Trusted Foundations. See the functions and
+         comments in linux/firmware/trusted_foundations.h or the device tree
+         bindings for "tlm,trusted-foundations" for details on how to use it.
+
+         Choose N if you don't know what this is about.
+
 config HAVE_ARM_SMCCC
        bool
 
+source "drivers/firmware/psci/Kconfig"
 source "drivers/firmware/broadcom/Kconfig"
 source "drivers/firmware/google/Kconfig"
 source "drivers/firmware/efi/Kconfig"